Title: [87990] trunk/Source/WebCore
- Revision
- 87990
- Author
- [email protected]
- Date
- 2011-06-02 20:12:49 -0700 (Thu, 02 Jun 2011)
Log Message
2011-06-02 James Robinson <[email protected]>
Unreviewed, rolling out r87901.
http://trac.webkit.org/changeset/87901
https://bugs.webkit.org/show_bug.cgi?id=61894
Might be responsible for performance regression on Chromium page cyclers, reverting to see...
* loader/DocumentLoader.h:
(WebCore::DocumentLoader::didTellClientAboutLoad):
(WebCore::DocumentLoader::haveToldClientAboutLoad):
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::loadedResourceFromMemoryCache):
* loader/ResourceLoadNotifier.cpp:
(WebCore::ResourceLoadNotifier::dispatchWillSendRequest):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (87989 => 87990)
--- trunk/Source/WebCore/ChangeLog 2011-06-03 02:41:09 UTC (rev 87989)
+++ trunk/Source/WebCore/ChangeLog 2011-06-03 03:12:49 UTC (rev 87990)
@@ -1,3 +1,19 @@
+2011-06-02 James Robinson <[email protected]>
+
+ Unreviewed, rolling out r87901.
+ http://trac.webkit.org/changeset/87901
+ https://bugs.webkit.org/show_bug.cgi?id=61894
+
+ Might be responsible for performance regression on Chromium page cyclers, reverting to see...
+
+ * loader/DocumentLoader.h:
+ (WebCore::DocumentLoader::didTellClientAboutLoad):
+ (WebCore::DocumentLoader::haveToldClientAboutLoad):
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::loadedResourceFromMemoryCache):
+ * loader/ResourceLoadNotifier.cpp:
+ (WebCore::ResourceLoadNotifier::dispatchWillSendRequest):
+
2011-06-02 Levi Weintraub <[email protected]>
Reviewed by Eric Seidel.
Modified: trunk/Source/WebCore/loader/DocumentLoader.h (87989 => 87990)
--- trunk/Source/WebCore/loader/DocumentLoader.h 2011-06-03 02:41:09 UTC (rev 87989)
+++ trunk/Source/WebCore/loader/DocumentLoader.h 2011-06-03 03:12:49 UTC (rev 87990)
@@ -224,18 +224,12 @@
void setDeferMainResourceDataLoad(bool defer) { m_deferMainResourceDataLoad = defer; }
bool deferMainResourceDataLoad() const { return m_deferMainResourceDataLoad; }
-#if PLATFORM(MAC)
void didTellClientAboutLoad(const String& url)
- {
+ {
if (!url.isEmpty())
m_resourcesClientKnowsAbout.add(url);
}
- bool haveToldClientAboutLoad(const String& url)
- {
- return m_resourcesClientKnowsAbout.contains(url);
- }
-#endif
-
+ bool haveToldClientAboutLoad(const String& url) { return m_resourcesClientKnowsAbout.contains(url); }
void recordMemoryCacheLoadForFutureClientNotification(const String& url);
void takeMemoryCacheLoadsForClientNotification(Vector<String>& loads);
@@ -334,9 +328,7 @@
RefPtr<SharedBuffer> m_parsedArchiveData;
#endif
-#if PLATFORM(MAC)
HashSet<String> m_resourcesClientKnowsAbout;
-#endif
Vector<String> m_resourcesLoadedFromMemoryCacheForClientNotification;
String m_clientRedirectSourceForHistory;
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (87989 => 87990)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2011-06-03 02:41:09 UTC (rev 87989)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2011-06-03 03:12:49 UTC (rev 87990)
@@ -3141,29 +3141,20 @@
if (!page)
return;
- if (!resource->sendResourceLoadCallbacks())
+ if (!resource->sendResourceLoadCallbacks() || m_documentLoader->haveToldClientAboutLoad(resource->url()))
return;
-#if PLATFORM(MAC)
- if (m_documentLoader->haveToldClientAboutLoad(resource->url()))
- return;
-#endif
-
if (!page->areMemoryCacheClientCallsEnabled()) {
InspectorInstrumentation::didLoadResourceFromMemoryCache(page, m_documentLoader.get(), resource);
m_documentLoader->recordMemoryCacheLoadForFutureClientNotification(resource->url());
-#if PLATFORM(MAC)
m_documentLoader->didTellClientAboutLoad(resource->url());
-#endif
return;
}
ResourceRequest request(resource->url());
if (m_client->dispatchDidLoadResourceFromMemoryCache(m_documentLoader.get(), request, resource->response(), resource->encodedSize())) {
InspectorInstrumentation::didLoadResourceFromMemoryCache(page, m_documentLoader.get(), resource);
-#if PLATFORM(MAC)
m_documentLoader->didTellClientAboutLoad(resource->url());
-#endif
return;
}
Modified: trunk/Source/WebCore/loader/ResourceLoadNotifier.cpp (87989 => 87990)
--- trunk/Source/WebCore/loader/ResourceLoadNotifier.cpp 2011-06-03 02:41:09 UTC (rev 87989)
+++ trunk/Source/WebCore/loader/ResourceLoadNotifier.cpp 2011-06-03 03:12:49 UTC (rev 87990)
@@ -107,18 +107,14 @@
void ResourceLoadNotifier::dispatchWillSendRequest(DocumentLoader* loader, unsigned long identifier, ResourceRequest& request, const ResourceResponse& redirectResponse)
{
-#if PLATFORM(MAC)
StringImpl* oldRequestURL = request.url().string().impl();
m_frame->loader()->documentLoader()->didTellClientAboutLoad(request.url());
-#endif
m_frame->loader()->client()->dispatchWillSendRequest(loader, identifier, request, redirectResponse);
-#if PLATFORM(MAC)
// If the URL changed, then we want to put that new URL in the "did tell client" set too.
if (!request.isNull() && oldRequestURL != request.url().string().impl())
m_frame->loader()->documentLoader()->didTellClientAboutLoad(request.url());
-#endif
InspectorInstrumentation::willSendRequest(m_frame, identifier, loader, request, redirectResponse);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
