Changeset 87990 in webkit


Ignore:
Timestamp:
Jun 2, 2011 8:12:49 PM (13 years ago)
Author:
jamesr@google.com
Message:

2011-06-02 James Robinson <jamesr@chromium.org>

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):
Location:
trunk/Source/WebCore
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r87989 r87990  
     12011-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
    1172011-06-02  Levi Weintraub  <leviw@chromium.org>
    218
  • trunk/Source/WebCore/loader/DocumentLoader.h

    r87901 r87990  
    225225        bool deferMainResourceDataLoad() const { return m_deferMainResourceDataLoad; }
    226226       
    227 #if PLATFORM(MAC)
    228227        void didTellClientAboutLoad(const String& url)
    229         {
     228        { 
    230229            if (!url.isEmpty())
    231230                m_resourcesClientKnowsAbout.add(url);
    232231        }
    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); }
    239233        void recordMemoryCacheLoadForFutureClientNotification(const String& url);
    240234        void takeMemoryCacheLoadsForClientNotification(Vector<String>& loads);
     
    335329#endif
    336330
    337 #if PLATFORM(MAC)
    338331        HashSet<String> m_resourcesClientKnowsAbout;
    339 #endif
    340332        Vector<String> m_resourcesLoadedFromMemoryCacheForClientNotification;
    341333       
  • trunk/Source/WebCore/loader/FrameLoader.cpp

    r87901 r87990  
    31423142        return;
    31433143
    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;
    31513146
    31523147    if (!page->areMemoryCacheClientCallsEnabled()) {
    31533148        InspectorInstrumentation::didLoadResourceFromMemoryCache(page, m_documentLoader.get(), resource);
    31543149        m_documentLoader->recordMemoryCacheLoadForFutureClientNotification(resource->url());
    3155 #if PLATFORM(MAC)
    31563150        m_documentLoader->didTellClientAboutLoad(resource->url());
    3157 #endif
    31583151        return;
    31593152    }
     
    31623155    if (m_client->dispatchDidLoadResourceFromMemoryCache(m_documentLoader.get(), request, resource->response(), resource->encodedSize())) {
    31633156        InspectorInstrumentation::didLoadResourceFromMemoryCache(page, m_documentLoader.get(), resource);
    3164 #if PLATFORM(MAC)
    31653157        m_documentLoader->didTellClientAboutLoad(resource->url());
    3166 #endif
    31673158        return;
    31683159    }
  • trunk/Source/WebCore/loader/ResourceLoadNotifier.cpp

    r87901 r87990  
    108108void ResourceLoadNotifier::dispatchWillSendRequest(DocumentLoader* loader, unsigned long identifier, ResourceRequest& request, const ResourceResponse& redirectResponse)
    109109{
    110 #if PLATFORM(MAC)
    111110    StringImpl* oldRequestURL = request.url().string().impl();
    112111    m_frame->loader()->documentLoader()->didTellClientAboutLoad(request.url());
    113 #endif
    114112
    115113    m_frame->loader()->client()->dispatchWillSendRequest(loader, identifier, request, redirectResponse);
    116114
    117 #if PLATFORM(MAC)
    118115    // If the URL changed, then we want to put that new URL in the "did tell client" set too.
    119116    if (!request.isNull() && oldRequestURL != request.url().string().impl())
    120117        m_frame->loader()->documentLoader()->didTellClientAboutLoad(request.url());
    121 #endif
    122118
    123119    InspectorInstrumentation::willSendRequest(m_frame, identifier, loader, request, redirectResponse);
Note: See TracChangeset for help on using the changeset viewer.