<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[20027] trunk</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/20027">20027</a></dd>
<dt>Author</dt> <dd>andersca</dd>
<dt>Date</dt> <dd>2007-03-07 11:31:55 -0800 (Wed, 07 Mar 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebCore:
Reviewed by Brady.
Remove some methods in FrameLoader that just calls down to the active document loader. Since each
resource loader now has a pointer to its document loader, we can just call directly to the
document loader.
* WebCore.exp:
* loader/FrameLoader.cpp:
* loader/FrameLoader.h:
* loader/MainResourceLoader.cpp:
(WebCore::MainResourceLoader::willSendRequest):
(WebCore::MainResourceLoader::didReceiveResponse):
* loader/SubresourceLoader.cpp:
(WebCore::SubresourceLoader::SubresourceLoader):
(WebCore::SubresourceLoader::didFinishLoading):
(WebCore::SubresourceLoader::didFail):
(WebCore::SubresourceLoader::didCancel):
* loader/mac/NetscapePlugInStreamLoaderMac.mm:
(WebCore::NetscapePlugInStreamLoader::didFinishLoading):
(WebCore::NetscapePlugInStreamLoader::didFail):
(WebCore::NetscapePlugInStreamLoader::didCancel):
WebKit:
Reviewed by Brady.
Update to match WebCore.
* Plugins/WebNetscapePluginStream.mm:
(-[WebNetscapePluginStream start]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreWebCoreexp">trunk/WebCore/WebCore.exp</a></li>
<li><a href="#trunkWebCoreloaderFrameLoadercpp">trunk/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkWebCoreloaderFrameLoaderh">trunk/WebCore/loader/FrameLoader.h</a></li>
<li><a href="#trunkWebCoreloaderMainResourceLoadercpp">trunk/WebCore/loader/MainResourceLoader.cpp</a></li>
<li><a href="#trunkWebCoreloaderSubresourceLoadercpp">trunk/WebCore/loader/SubresourceLoader.cpp</a></li>
<li><a href="#trunkWebCoreloadermacNetscapePlugInStreamLoaderMacmm">trunk/WebCore/loader/mac/NetscapePlugInStreamLoaderMac.mm</a></li>
<li><a href="#trunkWebKitChangeLog">trunk/WebKit/ChangeLog</a></li>
<li><a href="#trunkWebKitPluginsWebNetscapePluginStreammm">trunk/WebKit/Plugins/WebNetscapePluginStream.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (20026 => 20027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog 2007-03-07 19:25:10 UTC (rev 20026)
+++ trunk/WebCore/ChangeLog 2007-03-07 19:31:55 UTC (rev 20027)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2007-03-07 Anders Carlsson <acarlsson@apple.com>
+
+ Reviewed by Brady.
+
+ Remove some methods in FrameLoader that just calls down to the active document loader. Since each
+ resource loader now has a pointer to its document loader, we can just call directly to the
+ document loader.
+
+ * WebCore.exp:
+ * loader/FrameLoader.cpp:
+ * loader/FrameLoader.h:
+ * loader/MainResourceLoader.cpp:
+ (WebCore::MainResourceLoader::willSendRequest):
+ (WebCore::MainResourceLoader::didReceiveResponse):
+ * loader/SubresourceLoader.cpp:
+ (WebCore::SubresourceLoader::SubresourceLoader):
+ (WebCore::SubresourceLoader::didFinishLoading):
+ (WebCore::SubresourceLoader::didFail):
+ (WebCore::SubresourceLoader::didCancel):
+ * loader/mac/NetscapePlugInStreamLoaderMac.mm:
+ (WebCore::NetscapePlugInStreamLoader::didFinishLoading):
+ (WebCore::NetscapePlugInStreamLoader::didFail):
+ (WebCore::NetscapePlugInStreamLoader::didCancel):
+
</ins><span class="cx"> 2007-03-06 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by Maciej Stachowiak.
</span></span></pre></div>
<a id="trunkWebCoreWebCoreexp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/WebCore.exp (20026 => 20027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/WebCore.exp 2007-03-07 19:25:10 UTC (rev 20026)
+++ trunk/WebCore/WebCore.exp 2007-03-07 19:31:55 UTC (rev 20027)
</span><span class="lines">@@ -147,13 +147,11 @@
</span><span class="cx"> __ZN7WebCore11FrameLoader18currentHistoryItemEv
</span><span class="cx"> __ZN7WebCore11FrameLoader18shouldHideReferrerERKNS_4KURLERKNS_6StringE
</span><span class="cx"> __ZN7WebCore11FrameLoader20continueLoadWithDataEPNS_12SharedBufferERKNS_6StringES5_RKNS_4KURLE
</span><del>-__ZN7WebCore11FrameLoader21addPlugInStreamLoaderEPNS_14ResourceLoaderE
</del><span class="cx"> __ZN7WebCore11FrameLoader21setCurrentHistoryItemEN3WTF10PassRefPtrINS_11HistoryItemEEE
</span><span class="cx"> __ZN7WebCore11FrameLoader22setPreviousHistoryItemEN3WTF10PassRefPtrINS_11HistoryItemEEE
</span><span class="cx"> __ZN7WebCore11FrameLoader23reloadAllowingStaleDataERKNS_6StringE
</span><span class="cx"> __ZN7WebCore11FrameLoader23timeOfLastCompletedLoadEv
</span><span class="cx"> __ZN7WebCore11FrameLoader24registerURLSchemeAsLocalERKNS_6StringE
</span><del>-__ZN7WebCore11FrameLoader24removePlugInStreamLoaderEPNS_14ResourceLoaderE
</del><span class="cx"> __ZN7WebCore11FrameLoader24setRestrictAccessToLocalEb
</span><span class="cx"> __ZN7WebCore11FrameLoader25provisionalDocumentLoaderEv
</span><span class="cx"> __ZN7WebCore11FrameLoader25setProvisionalHistoryItemEN3WTF10PassRefPtrINS_11HistoryItemEEE
</span><span class="lines">@@ -241,7 +239,9 @@
</span><span class="cx"> __ZN7WebCore14DocumentLoader15detachFromFrameEv
</span><span class="cx"> __ZN7WebCore14DocumentLoader19prepareForLoadStartEv
</span><span class="cx"> __ZN7WebCore14DocumentLoader19setOverrideEncodingERKNS_6StringE
</span><ins>+__ZN7WebCore14DocumentLoader21addPlugInStreamLoaderEPNS_14ResourceLoaderE
</ins><span class="cx"> __ZN7WebCore14DocumentLoader22cancelMainResourceLoadERKNS_13ResourceErrorE
</span><ins>+__ZN7WebCore14DocumentLoader24removePlugInStreamLoaderEPNS_14ResourceLoaderE
</ins><span class="cx"> __ZN7WebCore14DocumentLoader32replaceRequestURLForAnchorScrollERKNS_4KURLE
</span><span class="cx"> __ZN7WebCore14DocumentLoader7requestEv
</span><span class="cx"> __ZN7WebCore14DocumentLoaderC2ERKNS_15ResourceRequestERKNS_14SubstituteDataE
</span></span></pre></div>
<a id="trunkWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/loader/FrameLoader.cpp (20026 => 20027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/loader/FrameLoader.cpp 2007-03-07 19:25:10 UTC (rev 20026)
+++ trunk/WebCore/loader/FrameLoader.cpp 2007-03-07 19:31:55 UTC (rev 20027)
</span><span class="lines">@@ -1937,16 +1937,6 @@
</span><span class="cx"> activeDocumentLoader()->receivedData(data, length);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameLoader::setRequest(const ResourceRequest& request)
-{
- activeDocumentLoader()->setRequest(request);
-}
-
-void FrameLoader::setResponse(const ResourceResponse& response)
-{
- activeDocumentLoader()->setResponse(response);
-}
-
</del><span class="cx"> bool FrameLoader::willUseArchive(ResourceLoader* loader, const ResourceRequest& request, const KURL& originalURL) const
</span><span class="cx"> {
</span><span class="cx"> return m_client->willUseArchive(loader, request, originalURL);
</span><span class="lines">@@ -2136,16 +2126,6 @@
</span><span class="cx"> return m_documentLoader.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameLoader::addPlugInStreamLoader(ResourceLoader* loader)
-{
- activeDocumentLoader()->addPlugInStreamLoader(loader);
-}
-
-void FrameLoader::removePlugInStreamLoader(ResourceLoader* loader)
-{
- activeDocumentLoader()->removePlugInStreamLoader(loader);
-}
-
</del><span class="cx"> bool FrameLoader::isLoading() const
</span><span class="cx"> {
</span><span class="cx"> if (m_isLoadingMainResource)
</span><span class="lines">@@ -2156,17 +2136,6 @@
</span><span class="cx"> return docLoader->isLoadingSubresources() || docLoader->isLoadingPlugIns();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameLoader::addSubresourceLoader(ResourceLoader* loader)
-{
- ASSERT(!m_provisionalDocumentLoader);
- activeDocumentLoader()->addSubresourceLoader(loader);
-}
-
-void FrameLoader::removeSubresourceLoader(ResourceLoader* loader)
-{
- activeDocumentLoader()->removeSubresourceLoader(loader);
-}
-
</del><span class="cx"> void FrameLoader::setDocumentLoader(DocumentLoader* loader)
</span><span class="cx"> {
</span><span class="cx"> if (!loader && !m_documentLoader)
</span></span></pre></div>
<a id="trunkWebCoreloaderFrameLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/loader/FrameLoader.h (20026 => 20027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/loader/FrameLoader.h 2007-03-07 19:25:10 UTC (rev 20026)
+++ trunk/WebCore/loader/FrameLoader.h 2007-03-07 19:31:55 UTC (rev 20027)
</span><span class="lines">@@ -166,12 +166,8 @@
</span><span class="cx"> void stopAllLoaders();
</span><span class="cx"> void cancelPendingArchiveLoad(ResourceLoader*);
</span><span class="cx">
</span><del>- void addPlugInStreamLoader(ResourceLoader*);
- void removePlugInStreamLoader(ResourceLoader*);
</del><span class="cx"> bool isLoadingMainResource() const;
</span><span class="cx"> bool isLoading() const;
</span><del>- void addSubresourceLoader(ResourceLoader*);
- void removeSubresourceLoader(ResourceLoader*);
</del><span class="cx">
</span><span class="cx"> int numPendingOrLoadingRequests(bool recurse) const;
</span><span class="cx"> bool isReloading() const;
</span><span class="lines">@@ -197,13 +193,11 @@
</span><span class="cx"> bool privateBrowsingEnabled() const;
</span><span class="cx"> const ResourceRequest& originalRequest() const;
</span><span class="cx"> const ResourceRequest& initialRequest() const;
</span><del>- void setRequest(const ResourceRequest&);
</del><span class="cx"> void receivedMainResourceError(const ResourceError&, bool isComplete);
</span><span class="cx"> void receivedData(const char*, int);
</span><span class="cx">
</span><span class="cx"> void handleFallbackContent();
</span><span class="cx"> bool isStopping() const;
</span><del>- void setResponse(const ResourceResponse&);
</del><span class="cx">
</span><span class="cx"> void finishedLoading();
</span><span class="cx"> KURL URL() const;
</span></span></pre></div>
<a id="trunkWebCoreloaderMainResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/loader/MainResourceLoader.cpp (20026 => 20027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/loader/MainResourceLoader.cpp 2007-03-07 19:25:10 UTC (rev 20026)
+++ trunk/WebCore/loader/MainResourceLoader.cpp 2007-03-07 19:31:55 UTC (rev 20027)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "MainResourceLoader.h"
</span><span class="cx">
</span><ins>+#include "DocumentLoader.h"
</ins><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "FrameLoader.h"
</span><span class="cx"> #include "FrameLoaderClient.h"
</span><span class="lines">@@ -162,7 +163,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Don't set this on the first request. It is set when the main load was started.
</span><del>- frameLoader()->setRequest(newRequest);
</del><ins>+ m_documentLoader->setRequest(newRequest);
</ins><span class="cx">
</span><span class="cx"> ref(); // balanced by deref in continueAfterNavigationPolicy
</span><span class="cx"> frameLoader()->checkNavigationPolicy(newRequest, callContinueAfterNavigationPolicy, this);
</span><span class="lines">@@ -265,7 +266,7 @@
</span><span class="cx"> // reference to this object; one example of this is 3266216.
</span><span class="cx"> RefPtr<MainResourceLoader> protect(this);
</span><span class="cx">
</span><del>- frameLoader()->setResponse(r);
</del><ins>+ m_documentLoader->setResponse(r);
</ins><span class="cx">
</span><span class="cx"> m_response = r;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkWebCoreloaderSubresourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/loader/SubresourceLoader.cpp (20026 => 20027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/loader/SubresourceLoader.cpp 2007-03-07 19:25:10 UTC (rev 20026)
+++ trunk/WebCore/loader/SubresourceLoader.cpp 2007-03-07 19:31:55 UTC (rev 20027)
</span><span class="lines">@@ -30,13 +30,14 @@
</span><span class="cx"> #include "SubresourceLoader.h"
</span><span class="cx">
</span><span class="cx"> #include "Document.h"
</span><ins>+#include "DocumentLoader.h"
</ins><span class="cx"> #include "Frame.h"
</span><ins>+#include "FrameLoader.h"
</ins><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "ResourceHandle.h"
</span><span class="cx"> #include "ResourceRequest.h"
</span><span class="cx"> #include "SubresourceLoaderClient.h"
</span><span class="cx"> #include "SharedBuffer.h"
</span><del>-#include "FrameLoader.h"
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -64,7 +65,7 @@
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> ++SubresourceLoaderCounter::count;
</span><span class="cx"> #endif
</span><del>- frameLoader()->addSubresourceLoader(this);
</del><ins>+ m_documentLoader->addSubresourceLoader(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SubresourceLoader::~SubresourceLoader()
</span><span class="lines">@@ -192,7 +193,7 @@
</span><span class="cx">
</span><span class="cx"> if (cancelled())
</span><span class="cx"> return;
</span><del>- frameLoader()->removeSubresourceLoader(this);
</del><ins>+ m_documentLoader->removeSubresourceLoader(this);
</ins><span class="cx"> ResourceLoader::didFinishLoading();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -212,7 +213,7 @@
</span><span class="cx">
</span><span class="cx"> if (cancelled())
</span><span class="cx"> return;
</span><del>- frameLoader()->removeSubresourceLoader(this);
</del><ins>+ m_documentLoader->removeSubresourceLoader(this);
</ins><span class="cx"> ResourceLoader::didFail(error);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -228,7 +229,7 @@
</span><span class="cx">
</span><span class="cx"> if (cancelled())
</span><span class="cx"> return;
</span><del>- frameLoader()->removeSubresourceLoader(this);
</del><ins>+ m_documentLoader->removeSubresourceLoader(this);
</ins><span class="cx"> ResourceLoader::didCancel(error);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkWebCoreloadermacNetscapePlugInStreamLoaderMacmm"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/loader/mac/NetscapePlugInStreamLoaderMac.mm (20026 => 20027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/loader/mac/NetscapePlugInStreamLoaderMac.mm 2007-03-07 19:25:10 UTC (rev 20026)
+++ trunk/WebCore/loader/mac/NetscapePlugInStreamLoaderMac.mm 2007-03-07 19:31:55 UTC (rev 20027)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "NetscapePlugInStreamLoader.h"
</span><span class="cx">
</span><ins>+#import "DocumentLoader.h"
</ins><span class="cx"> #import "FrameLoader.h"
</span><span class="cx"> #import "ResourceError.h"
</span><span class="cx"> #import "ResourceResponse.h"
</span><span class="lines">@@ -104,7 +105,7 @@
</span><span class="cx"> // Calling removePlugInStreamLoader will likely result in a call to deref, so we must protect.
</span><span class="cx"> RefPtr<NetscapePlugInStreamLoader> protect(this);
</span><span class="cx">
</span><del>- frameLoader()->removePlugInStreamLoader(this);
</del><ins>+ m_documentLoader->removePlugInStreamLoader(this);
</ins><span class="cx"> NSData *data = resourceData()->createNSData();
</span><span class="cx"> [m_stream.get() finishedLoadingWithData:data];
</span><span class="cx"> [data release];
</span><span class="lines">@@ -118,7 +119,7 @@
</span><span class="cx"> // One example of this is Radar 3266216.
</span><span class="cx"> RefPtr<NetscapePlugInStreamLoader> protect(this);
</span><span class="cx">
</span><del>- frameLoader()->removePlugInStreamLoader(this);
</del><ins>+ m_documentLoader->removePlugInStreamLoader(this);
</ins><span class="cx"> [m_stream.get() destroyStreamWithError:error];
</span><span class="cx"> ResourceLoader::didFail(error);
</span><span class="cx"> }
</span><span class="lines">@@ -128,7 +129,7 @@
</span><span class="cx"> // Calling removePlugInStreamLoader will likely result in a call to deref, so we must protect.
</span><span class="cx"> RefPtr<NetscapePlugInStreamLoader> protect(this);
</span><span class="cx">
</span><del>- frameLoader()->removePlugInStreamLoader(this);
</del><ins>+ m_documentLoader->removePlugInStreamLoader(this);
</ins><span class="cx"> [m_stream.get() destroyStreamWithError:error];
</span><span class="cx"> ResourceLoader::didCancel(error);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/ChangeLog (20026 => 20027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/ChangeLog 2007-03-07 19:25:10 UTC (rev 20026)
+++ trunk/WebKit/ChangeLog 2007-03-07 19:31:55 UTC (rev 20027)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2007-03-07 Anders Carlsson <acarlsson@apple.com>
+
+ Reviewed by Brady.
+
+ Update to match WebCore.
+
+ * Plugins/WebNetscapePluginStream.mm:
+ (-[WebNetscapePluginStream start]):
+
</ins><span class="cx"> 2007-03-07 Jim Correia <jim.correia@pobox.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by Darin.
</span></span></pre></div>
<a id="trunkWebKitPluginsWebNetscapePluginStreammm"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/Plugins/WebNetscapePluginStream.mm (20026 => 20027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/Plugins/WebNetscapePluginStream.mm 2007-03-07 19:25:10 UTC (rev 20026)
+++ trunk/WebKit/Plugins/WebNetscapePluginStream.mm 2007-03-07 19:31:55 UTC (rev 20027)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #import <WebKit/WebNetscapePluginStream.h>
</span><span class="cx">
</span><span class="cx"> #import <Foundation/NSURLConnection.h>
</span><ins>+#import <WebCore/DocumentLoader.h>
</ins><span class="cx"> #import <WebCore/Frame.h>
</span><span class="cx"> #import <WebCore/FrameLoader.h>
</span><span class="cx"> #import <WebCore/NetscapePlugInStreamLoader.h>
</span><span class="lines">@@ -107,9 +108,9 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(request);
</span><span class="cx">
</span><del>- _loader->frameLoader()->addPlugInStreamLoader(_loader);
</del><ins>+ _loader->documentLoader()->addPlugInStreamLoader(_loader);
</ins><span class="cx"> if (!_loader->load(request))
</span><del>- _loader->frameLoader()->removePlugInStreamLoader(_loader);
</del><ins>+ _loader->documentLoader()->removePlugInStreamLoader(_loader);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)cancelLoadWithError:(NSError *)error
</span></span></pre>
</div>
</div>
</body>
</html>