Changeset 87990 in webkit
- Timestamp:
- Jun 2, 2011 8:12:49 PM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r87989 r87990 1 2011-06-02 James Robinson <jamesr@chromium.org> 2 3 Unreviewed, rolling out r87901. 4 http://trac.webkit.org/changeset/87901 5 https://bugs.webkit.org/show_bug.cgi?id=61894 6 7 Might be responsible for performance regression on Chromium page cyclers, reverting to see... 8 9 * loader/DocumentLoader.h: 10 (WebCore::DocumentLoader::didTellClientAboutLoad): 11 (WebCore::DocumentLoader::haveToldClientAboutLoad): 12 * loader/FrameLoader.cpp: 13 (WebCore::FrameLoader::loadedResourceFromMemoryCache): 14 * loader/ResourceLoadNotifier.cpp: 15 (WebCore::ResourceLoadNotifier::dispatchWillSendRequest): 16 1 17 2011-06-02 Levi Weintraub <leviw@chromium.org> 2 18 -
trunk/Source/WebCore/loader/DocumentLoader.h
r87901 r87990 225 225 bool deferMainResourceDataLoad() const { return m_deferMainResourceDataLoad; } 226 226 227 #if PLATFORM(MAC)228 227 void didTellClientAboutLoad(const String& url) 229 { 228 { 230 229 if (!url.isEmpty()) 231 230 m_resourcesClientKnowsAbout.add(url); 232 231 } 233 bool haveToldClientAboutLoad(const String& url) 234 { 235 return m_resourcesClientKnowsAbout.contains(url); 236 } 237 #endif 238 232 bool haveToldClientAboutLoad(const String& url) { return m_resourcesClientKnowsAbout.contains(url); } 239 233 void recordMemoryCacheLoadForFutureClientNotification(const String& url); 240 234 void takeMemoryCacheLoadsForClientNotification(Vector<String>& loads); … … 335 329 #endif 336 330 337 #if PLATFORM(MAC)338 331 HashSet<String> m_resourcesClientKnowsAbout; 339 #endif340 332 Vector<String> m_resourcesLoadedFromMemoryCacheForClientNotification; 341 333 -
trunk/Source/WebCore/loader/FrameLoader.cpp
r87901 r87990 3142 3142 return; 3143 3143 3144 if (!resource->sendResourceLoadCallbacks()) 3145 return; 3146 3147 #if PLATFORM(MAC) 3148 if (m_documentLoader->haveToldClientAboutLoad(resource->url())) 3149 return; 3150 #endif 3144 if (!resource->sendResourceLoadCallbacks() || m_documentLoader->haveToldClientAboutLoad(resource->url())) 3145 return; 3151 3146 3152 3147 if (!page->areMemoryCacheClientCallsEnabled()) { 3153 3148 InspectorInstrumentation::didLoadResourceFromMemoryCache(page, m_documentLoader.get(), resource); 3154 3149 m_documentLoader->recordMemoryCacheLoadForFutureClientNotification(resource->url()); 3155 #if PLATFORM(MAC)3156 3150 m_documentLoader->didTellClientAboutLoad(resource->url()); 3157 #endif3158 3151 return; 3159 3152 } … … 3162 3155 if (m_client->dispatchDidLoadResourceFromMemoryCache(m_documentLoader.get(), request, resource->response(), resource->encodedSize())) { 3163 3156 InspectorInstrumentation::didLoadResourceFromMemoryCache(page, m_documentLoader.get(), resource); 3164 #if PLATFORM(MAC)3165 3157 m_documentLoader->didTellClientAboutLoad(resource->url()); 3166 #endif3167 3158 return; 3168 3159 } -
trunk/Source/WebCore/loader/ResourceLoadNotifier.cpp
r87901 r87990 108 108 void ResourceLoadNotifier::dispatchWillSendRequest(DocumentLoader* loader, unsigned long identifier, ResourceRequest& request, const ResourceResponse& redirectResponse) 109 109 { 110 #if PLATFORM(MAC)111 110 StringImpl* oldRequestURL = request.url().string().impl(); 112 111 m_frame->loader()->documentLoader()->didTellClientAboutLoad(request.url()); 113 #endif114 112 115 113 m_frame->loader()->client()->dispatchWillSendRequest(loader, identifier, request, redirectResponse); 116 114 117 #if PLATFORM(MAC)118 115 // If the URL changed, then we want to put that new URL in the "did tell client" set too. 119 116 if (!request.isNull() && oldRequestURL != request.url().string().impl()) 120 117 m_frame->loader()->documentLoader()->didTellClientAboutLoad(request.url()); 121 #endif122 118 123 119 InspectorInstrumentation::willSendRequest(m_frame, identifier, loader, request, redirectResponse);
Note: See TracChangeset
for help on using the changeset viewer.