[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
abarth at webkit.org
abarth at webkit.org
Wed Dec 22 13:18:20 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 9b003a98c52473230f6f541aee662d8c15827dc8
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 10 19:54:10 2010 +0000
2010-09-10 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
Main resource bytes shouldn't bounce through FrameLoader
https://bugs.webkit.org/show_bug.cgi?id=45496
After the MainResourceLoader hands the bytes for the main resource to
the DocumentLoader, the DocumentLoader hands the bytes to the
FrameLoaderClient. The FrameLoaderClient, in turn, returns the bytes
to WebCore. Prior to this patch, the FrameLoaderClient returned the
bytes to the FrameLoader. However, the FrameLoader was actually adding
any value.
In this patch, we change the FrameLoaderClient to return the bytes to
the DocumentLoader directly. In a future patch, we'll cut out the
FrameLoaderClient middleman and handle the bytes internally in the
DocumentLoader.
* WebCore.exp.in:
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::addData):
* loader/DocumentLoader.h:
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::finishedLoadingDocument):
* loader/FrameLoader.h:
2010-09-10 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
Main resource bytes shouldn't bounce through FrameLoader
https://bugs.webkit.org/show_bug.cgi?id=45496
Now return the bytes to the DocumentLoader.
Also, removed comment about wrong code in the Mac port.
* src/WebFrameImpl.cpp:
(WebKit::WebFrameImpl::commitDocumentData):
2010-09-10 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
Main resource bytes shouldn't bounce through FrameLoader
https://bugs.webkit.org/show_bug.cgi?id=45496
Now return the bytes to the DocumentLoader.
* WebCoreSupport/FrameLoaderClientEfl.cpp:
(WebCore::FrameLoaderClientEfl::committedLoad):
2010-09-10 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
Main resource bytes shouldn't bounce through FrameLoader
https://bugs.webkit.org/show_bug.cgi?id=45496
Now return the bytes to the DocumentLoader.
* WebCoreSupport/FrameLoaderClientGtk.cpp:
(WebKit::FrameLoaderClient::committedLoad):
2010-09-10 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
Main resource bytes shouldn't bounce through FrameLoader
https://bugs.webkit.org/show_bug.cgi?id=45496
Now return the bytes to the DocumentLoader.
* WebCoreSupport/FrameLoaderClientHaiku.cpp:
(WebCore::FrameLoaderClientHaiku::committedLoad):
2010-09-10 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
Main resource bytes shouldn't bounce through FrameLoader
https://bugs.webkit.org/show_bug.cgi?id=45496
Now return the bytes to the DocumentLoader.
Previously, we were checking the document for null. However, Frame can
never have a null document, so this check is no longer needed.
* WebView/WebFrame.mm:
(-[WebFrame _addData:]):
2010-09-10 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
Main resource bytes shouldn't bounce through FrameLoader
https://bugs.webkit.org/show_bug.cgi?id=45496
Now return the bytes to the DocumentLoader.
* WebCoreSupport/FrameLoaderClientQt.cpp:
(WebCore::FrameLoaderClientQt::committedLoad):
2010-09-10 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
Main resource bytes shouldn't bounce through FrameLoader
https://bugs.webkit.org/show_bug.cgi?id=45496
Now return the bytes to the DocumentLoader.
* WebCoreSupport/WebFrameLoaderClient.cpp:
(WebFrameLoaderClient::receivedData):
2010-09-10 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
Main resource bytes shouldn't bounce through FrameLoader
https://bugs.webkit.org/show_bug.cgi?id=45496
Now return the bytes to the DocumentLoader.
* WebKitSupport/FrameLoaderClientWx.cpp:
(WebCore::FrameLoaderClientWx::committedLoad):
2010-09-10 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
Main resource bytes shouldn't bounce through FrameLoader
https://bugs.webkit.org/show_bug.cgi?id=45496
Now return the bytes to the DocumentLoader.
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::receivedData):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67223 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 856ac01..75c9cc7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,30 @@
+2010-09-10 Adam Barth <abarth at webkit.org>
+
+ Reviewed by Eric Seidel.
+
+ Main resource bytes shouldn't bounce through FrameLoader
+ https://bugs.webkit.org/show_bug.cgi?id=45496
+
+ After the MainResourceLoader hands the bytes for the main resource to
+ the DocumentLoader, the DocumentLoader hands the bytes to the
+ FrameLoaderClient. The FrameLoaderClient, in turn, returns the bytes
+ to WebCore. Prior to this patch, the FrameLoaderClient returned the
+ bytes to the FrameLoader. However, the FrameLoader was actually adding
+ any value.
+
+ In this patch, we change the FrameLoaderClient to return the bytes to
+ the DocumentLoader directly. In a future patch, we'll cut out the
+ FrameLoaderClient middleman and handle the bytes internally in the
+ DocumentLoader.
+
+ * WebCore.exp.in:
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::addData):
+ * loader/DocumentLoader.h:
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::finishedLoadingDocument):
+ * loader/FrameLoader.h:
+
2010-09-10 Oliver Hunt <oliver at apple.com>
Reviewed by Darin Adler.
diff --git a/WebCore/WebCore.exp.in b/WebCore/WebCore.exp.in
index d5135a3..265f42d 100644
--- a/WebCore/WebCore.exp.in
+++ b/WebCore/WebCore.exp.in
@@ -170,7 +170,6 @@ __ZN7WebCore11FrameLoader4loadERKNS_15ResourceRequestERKN3WTF6StringEb
__ZN7WebCore11FrameLoader4loadERKNS_15ResourceRequestERKNS_14SubstituteDataEb
__ZN7WebCore11FrameLoader4loadERKNS_15ResourceRequestEb
__ZN7WebCore11FrameLoader6reloadEb
-__ZN7WebCore11FrameLoader7addDataEPKci
__ZN7WebCore11Geolocation12setIsAllowedEb
__ZN7WebCore11GeolocationD1Ev
__ZN7WebCore11HistoryItem10targetItemEv
@@ -299,6 +298,7 @@ __ZN7WebCore14DocumentLoader21addPlugInStreamLoaderEPNS_14ResourceLoaderE
__ZN7WebCore14DocumentLoader22addAllArchiveResourcesEPNS_7ArchiveE
__ZN7WebCore14DocumentLoader22cancelMainResourceLoadERKNS_13ResourceErrorE
__ZN7WebCore14DocumentLoader24removePlugInStreamLoaderEPNS_14ResourceLoaderE
+__ZN7WebCore14DocumentLoader7addDataEPKci
__ZN7WebCore14DocumentLoader7requestEv
__ZN7WebCore14DocumentLoader8setFrameEPNS_5FrameE
__ZN7WebCore14DocumentLoader8setTitleERKN3WTF6StringE
diff --git a/WebCore/loader/DocumentLoader.cpp b/WebCore/loader/DocumentLoader.cpp
index b07b538..a58263e 100644
--- a/WebCore/loader/DocumentLoader.cpp
+++ b/WebCore/loader/DocumentLoader.cpp
@@ -286,6 +286,14 @@ void DocumentLoader::commitLoad(const char* data, int length)
frameLoader->client()->committedLoad(this, data, length);
}
+void DocumentLoader::addData(const char* bytes, int length)
+{
+ ASSERT(m_frame->document());
+ ASSERT(m_frame->document()->parsing());
+ // FIXME: DocumentWriter should move to be owned by DocumentLoader.
+ frameLoader()->writer()->addData(bytes, length);
+}
+
bool DocumentLoader::doesProgressiveLoad(const String& MIMEType) const
{
return !frameLoader()->isReplacing() || MIMEType == "text/html";
diff --git a/WebCore/loader/DocumentLoader.h b/WebCore/loader/DocumentLoader.h
index 8ec3daa..a7b8b41 100644
--- a/WebCore/loader/DocumentLoader.h
+++ b/WebCore/loader/DocumentLoader.h
@@ -211,6 +211,8 @@ namespace WebCore {
DocumentLoadTiming* timing() { return &m_documentLoadTiming; }
void resetTiming() { m_documentLoadTiming = DocumentLoadTiming(); }
+ void addData(const char* bytes, int length);
+
#if ENABLE(OFFLINE_WEB_APPLICATIONS)
ApplicationCacheHost* applicationCacheHost() const { return m_applicationCacheHost.get(); }
#endif
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index bf17ed9..3ea0863 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -1089,14 +1089,6 @@ void FrameLoader::willSetEncoding()
receivedFirstData();
}
-void FrameLoader::addData(const char* bytes, int length)
-{
- ASSERT(m_workingURL.isEmpty());
- ASSERT(m_frame->document());
- ASSERT(m_frame->document()->parsing());
- writer()->addData(bytes, length);
-}
-
#if ENABLE(WML)
static inline bool frameContainsWMLContent(Frame* frame)
{
@@ -2255,7 +2247,7 @@ void FrameLoader::finishedLoadingDocument(DocumentLoader* loader)
ASSERT(m_frame->document());
- addData(mainResource->data()->data(), mainResource->data()->size());
+ loader->addData(mainResource->data()->data(), mainResource->data()->size());
}
bool FrameLoader::isReplacing() const
diff --git a/WebCore/loader/FrameLoader.h b/WebCore/loader/FrameLoader.h
index b388d9f..336a357 100644
--- a/WebCore/loader/FrameLoader.h
+++ b/WebCore/loader/FrameLoader.h
@@ -261,8 +261,6 @@ public:
void resetMultipleFormSubmissionProtection();
- void addData(const char* bytes, int length);
-
void checkCallImplicitClose();
void frameDetached();
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index adc37dc..b4d79fd 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-10 Adam Barth <abarth at webkit.org>
+
+ Reviewed by Eric Seidel.
+
+ Main resource bytes shouldn't bounce through FrameLoader
+ https://bugs.webkit.org/show_bug.cgi?id=45496
+
+ Now return the bytes to the DocumentLoader.
+
+ Also, removed comment about wrong code in the Mac port.
+
+ * src/WebFrameImpl.cpp:
+ (WebKit::WebFrameImpl::commitDocumentData):
+
2010-09-08 Darin Adler <darin at apple.com>
Reviewed by Adam Barth.
diff --git a/WebKit/chromium/src/WebFrameImpl.cpp b/WebKit/chromium/src/WebFrameImpl.cpp
index a2d6a46..6620516 100644
--- a/WebKit/chromium/src/WebFrameImpl.cpp
+++ b/WebKit/chromium/src/WebFrameImpl.cpp
@@ -1012,7 +1012,8 @@ void WebFrameImpl::dispatchWillSendRequest(WebURLRequest& request)
0, 0, request.toMutableResourceRequest(), response);
}
-void WebFrameImpl::commitDocumentData(const char* data, size_t dataLen)
+// FIXME: This function should be moved into WebCore.
+void WebFrameImpl::commitDocumentData(const char* data, size_t length)
{
DocumentLoader* documentLoader = m_frame->loader()->documentLoader();
@@ -1025,9 +1026,7 @@ void WebFrameImpl::commitDocumentData(const char* data, size_t dataLen)
encoding = documentLoader->response().textEncodingName();
}
m_frame->loader()->writer()->setEncoding(encoding, userChosen);
-
- // NOTE: mac only does this if there is a document
- m_frame->loader()->addData(data, dataLen);
+ m_frame->documentLoader()->addData(data, length);
}
unsigned WebFrameImpl::unloadListenerCount() const
diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
index e805d2c..e492a5b 100644
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-10 Adam Barth <abarth at webkit.org>
+
+ Reviewed by Eric Seidel.
+
+ Main resource bytes shouldn't bounce through FrameLoader
+ https://bugs.webkit.org/show_bug.cgi?id=45496
+
+ Now return the bytes to the DocumentLoader.
+
+ * WebCoreSupport/FrameLoaderClientEfl.cpp:
+ (WebCore::FrameLoaderClientEfl::committedLoad):
+
2010-09-08 Darin Adler <darin at apple.com>
Reviewed by Adam Barth.
diff --git a/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp b/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp
index 8ec783a..f0aaa5f 100644
--- a/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp
+++ b/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp
@@ -182,7 +182,7 @@ void FrameLoaderClientEfl::dispatchWillSubmitForm(FramePolicyFunction function,
callPolicyFunction(function, PolicyUse);
}
-
+// FIXME: This function should be moved into WebCore.
void FrameLoaderClientEfl::committedLoad(DocumentLoader* loader, const char* data, int length)
{
if (!m_pluginView) {
@@ -194,7 +194,7 @@ void FrameLoaderClientEfl::committedLoad(DocumentLoader* loader, const char* dat
fl->writer()->setEncoding(m_response.textEncodingName(), false);
m_firstData = false;
}
- fl->addData(data, length);
+ fl->documentLoader()->addData(data, length);
}
// We re-check here as the plugin can have been created
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 7d42874..036c5ce 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-10 Adam Barth <abarth at webkit.org>
+
+ Reviewed by Eric Seidel.
+
+ Main resource bytes shouldn't bounce through FrameLoader
+ https://bugs.webkit.org/show_bug.cgi?id=45496
+
+ Now return the bytes to the DocumentLoader.
+
+ * WebCoreSupport/FrameLoaderClientGtk.cpp:
+ (WebKit::FrameLoaderClient::committedLoad):
+
2010-09-10 Martin Robinson <mrobinson at igalia.com>
Reviewed by Xan Lopez.
diff --git a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
index 47ffa88..5974396 100644
--- a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
@@ -245,7 +245,7 @@ void FrameLoaderClient::dispatchWillSubmitForm(FramePolicyFunction policyFunctio
(core(m_frame)->loader()->policyChecker()->*policyFunction)(PolicyUse);
}
-
+// FIXME: This function should be moved into WebCore.
void FrameLoaderClient::committedLoad(WebCore::DocumentLoader* loader, const char* data, int length)
{
if (!m_pluginView) {
@@ -260,7 +260,7 @@ void FrameLoaderClient::committedLoad(WebCore::DocumentLoader* loader, const cha
FrameLoader* frameLoader = loader->frameLoader();
frameLoader->writer()->setEncoding(encoding, userChosen);
if (data)
- frameLoader->addData(data, length);
+ frameLoader->documentLoader()->addData(data, length);
Frame* coreFrame = loader->frame();
if (coreFrame && coreFrame->document() && coreFrame->document()->isMediaDocument())
diff --git a/WebKit/haiku/ChangeLog b/WebKit/haiku/ChangeLog
index 986b00f..dcb0f14 100644
--- a/WebKit/haiku/ChangeLog
+++ b/WebKit/haiku/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-10 Adam Barth <abarth at webkit.org>
+
+ Reviewed by Eric Seidel.
+
+ Main resource bytes shouldn't bounce through FrameLoader
+ https://bugs.webkit.org/show_bug.cgi?id=45496
+
+ Now return the bytes to the DocumentLoader.
+
+ * WebCoreSupport/FrameLoaderClientHaiku.cpp:
+ (WebCore::FrameLoaderClientHaiku::committedLoad):
+
2010-08-06 Gavin Barraclough <barraclough at apple.com>
Rubber stamped by Sam Weinig
diff --git a/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp b/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp
index 430194a..f3d1f87 100644
--- a/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp
+++ b/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp
@@ -504,6 +504,7 @@ void FrameLoaderClientHaiku::setMainDocumentError(WebCore::DocumentLoader*, cons
notImplemented();
}
+// FIXME: This function should be moved into WebCore.
void FrameLoaderClientHaiku::committedLoad(WebCore::DocumentLoader* loader, const char* data, int length)
{
if (!m_frame)
@@ -511,7 +512,7 @@ void FrameLoaderClientHaiku::committedLoad(WebCore::DocumentLoader* loader, cons
FrameLoader* frameLoader = loader->frameLoader();
frameLoader->writer()->setEncoding(m_response.textEncodingName(), false);
- frameLoader->addData(data, length);
+ frameLoader->documentLoader()->addData(data, length);
}
WebCore::ResourceError FrameLoaderClientHaiku::cancelledError(const WebCore::ResourceRequest& request)
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index df5ca46..bfe87fe 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,18 @@
+2010-09-10 Adam Barth <abarth at webkit.org>
+
+ Reviewed by Eric Seidel.
+
+ Main resource bytes shouldn't bounce through FrameLoader
+ https://bugs.webkit.org/show_bug.cgi?id=45496
+
+ Now return the bytes to the DocumentLoader.
+
+ Previously, we were checking the document for null. However, Frame can
+ never have a null document, so this check is no longer needed.
+
+ * WebView/WebFrame.mm:
+ (-[WebFrame _addData:]):
+
2010-09-09 John Therrell <jtherrell at apple.com>
Reviewed by Alexey Proskuryakov.
diff --git a/WebKit/mac/WebView/WebFrame.mm b/WebKit/mac/WebView/WebFrame.mm
index 8d564a3..9a987be 100644
--- a/WebKit/mac/WebView/WebFrame.mm
+++ b/WebKit/mac/WebView/WebFrame.mm
@@ -490,16 +490,9 @@ static inline WebDataSource *dataSource(DocumentLoader* loader)
- (void)_addData:(NSData *)data
{
Document* document = _private->coreFrame->document();
-
- // Document may be nil if the part is about to redirect
- // as a result of JS executing during load, i.e. one frame
- // changing another's location before the frame's document
- // has been created.
- if (!document)
- return;
document->setShouldCreateRenderers(_private->shouldCreateRenderers);
- _private->coreFrame->loader()->addData((const char *)[data bytes], [data length]);
+ _private->coreFrame->loader()->documentLoader()->addData((const char *)[data bytes], [data length]);
}
- (NSString *)_stringWithDocumentTypeStringAndMarkupString:(NSString *)markupString
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 95e79a4..711afb5 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-10 Adam Barth <abarth at webkit.org>
+
+ Reviewed by Eric Seidel.
+
+ Main resource bytes shouldn't bounce through FrameLoader
+ https://bugs.webkit.org/show_bug.cgi?id=45496
+
+ Now return the bytes to the DocumentLoader.
+
+ * WebCoreSupport/FrameLoaderClientQt.cpp:
+ (WebCore::FrameLoaderClientQt::committedLoad):
+
2010-09-08 Darin Adler <darin at apple.com>
Reviewed by Adam Barth.
diff --git a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
index 2d73f7f..cb14b4b 100644
--- a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -789,6 +789,7 @@ void FrameLoaderClientQt::setMainDocumentError(WebCore::DocumentLoader* loader,
}
}
+// FIXME: This function should be moved into WebCore.
void FrameLoaderClientQt::committedLoad(WebCore::DocumentLoader* loader, const char* data, int length)
{
if (!m_pluginView) {
@@ -799,7 +800,7 @@ void FrameLoaderClientQt::committedLoad(WebCore::DocumentLoader* loader, const c
fl->writer()->setEncoding(m_response.textEncodingName(), false);
m_firstData = false;
}
- fl->addData(data, length);
+ fl->documentLoader()->addData(data, length);
}
// We re-check here as the plugin can have been created
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index b7e49cf..bfa9ccc 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-10 Adam Barth <abarth at webkit.org>
+
+ Reviewed by Eric Seidel.
+
+ Main resource bytes shouldn't bounce through FrameLoader
+ https://bugs.webkit.org/show_bug.cgi?id=45496
+
+ Now return the bytes to the DocumentLoader.
+
+ * WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebFrameLoaderClient::receivedData):
+
2010-09-09 Simon Fraser <simon.fraser at apple.com>
Reviewed by Adam Roben.
diff --git a/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp b/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
index 48f7f3b..886f23c 100644
--- a/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
+++ b/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
@@ -512,6 +512,7 @@ void WebFrameLoaderClient::committedLoad(DocumentLoader* loader, const char* dat
m_manualLoader->didReceiveData(data, length);
}
+// FIXME: This function should be moved into WebCore.
void WebFrameLoaderClient::receivedData(const char* data, int length, const String& textEncoding)
{
Frame* coreFrame = core(m_webFrame);
@@ -524,8 +525,7 @@ void WebFrameLoaderClient::receivedData(const char* data, int length, const Stri
if (encoding.isNull())
encoding = textEncoding;
coreFrame->loader()->writer()->setEncoding(encoding, userChosen);
-
- coreFrame->loader()->addData(data, length);
+ coreFrame->loader()->documentLoader()->addData(data, length);
}
void WebFrameLoaderClient::finishedLoading(DocumentLoader* loader)
diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
index 8edf46f..718fdfc 100644
--- a/WebKit/wx/ChangeLog
+++ b/WebKit/wx/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-10 Adam Barth <abarth at webkit.org>
+
+ Reviewed by Eric Seidel.
+
+ Main resource bytes shouldn't bounce through FrameLoader
+ https://bugs.webkit.org/show_bug.cgi?id=45496
+
+ Now return the bytes to the DocumentLoader.
+
+ * WebKitSupport/FrameLoaderClientWx.cpp:
+ (WebCore::FrameLoaderClientWx::committedLoad):
+
2010-09-08 Darin Adler <darin at apple.com>
Reviewed by Adam Barth.
diff --git a/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp b/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
index 5b708c2..eac5af1 100644
--- a/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
+++ b/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
@@ -612,6 +612,7 @@ void FrameLoaderClientWx::setMainDocumentError(WebCore::DocumentLoader* loader,
}
}
+// FIXME: This function should be moved into WebCore.
void FrameLoaderClientWx::committedLoad(WebCore::DocumentLoader* loader, const char* data, int length)
{
if (!m_webFrame)
@@ -619,7 +620,7 @@ void FrameLoaderClientWx::committedLoad(WebCore::DocumentLoader* loader, const c
if (!m_pluginView) {
FrameLoader* fl = loader->frameLoader();
fl->writer()->setEncoding(m_response.textEncodingName(), false);
- fl->addData(data, length);
+ fl->documentLoader()->addData(data, length);
}
// We re-check here as the plugin can have been created
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 5fde4e5..cfcae42 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-10 Adam Barth <abarth at webkit.org>
+
+ Reviewed by Eric Seidel.
+
+ Main resource bytes shouldn't bounce through FrameLoader
+ https://bugs.webkit.org/show_bug.cgi?id=45496
+
+ Now return the bytes to the DocumentLoader.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::receivedData):
+
2010-09-10 Adam Roben <aroben at apple.com>
Don't crash when a frame is destroyed after the UI process has
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
index e4f611f..168948b 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
@@ -620,6 +620,7 @@ void WebFrameLoaderClient::committedLoad(DocumentLoader* loader, const char* dat
m_pluginView->manualLoadDidReceiveData(data, length);
}
+// FIXME: This function should be moved into WebCore.
void WebFrameLoaderClient::receivedData(const char* data, int length, const String& textEncoding)
{
Frame* coreFrame = m_frame->coreFrame();
@@ -633,7 +634,7 @@ void WebFrameLoaderClient::receivedData(const char* data, int length, const Stri
encoding = textEncoding;
coreFrame->loader()->writer()->setEncoding(encoding, userChosen);
- coreFrame->loader()->addData(data, length);
+ coreFrame->loader()->documentLoader()->addData(data, length);
}
void WebFrameLoaderClient::finishedLoading(DocumentLoader* loader)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list