Changeset 140105 in webkit


Ignore:
Timestamp:
Jan 18, 2013 12:26:38 AM (11 years ago)
Author:
dominicc@chromium.org
Message:

Unreviewed, rolling out r140005.
​http://trac.webkit.org/changeset/140005
​https://bugs.webkit.org/show_bug.cgi?id=107235

broke downstream Chromium interactive_ui_tests (Requested by
dominicc on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2013-01-18

.:

  • Source/autotools/symbols.filter:

Source/WebCore:

  • WebCore.exp.in:
  • dom/Document.cpp:
  • dom/Document.h:

(WebCore::Document::documentElement):

  • loader/FrameLoader.cpp:

(WebCore::FrameLoader::loadedResourceFromMemoryCache):

  • loader/MainResourceLoader.cpp:

(WebCore::MainResourceLoader::MainResourceLoader):
(WebCore::MainResourceLoader::receivedError):
(WebCore::MainResourceLoader::willSendRequest):
(WebCore::MainResourceLoader::responseReceived):
(WebCore::MainResourceLoader::didFinishLoading):
(WebCore::MainResourceLoader::load):
(WebCore::MainResourceLoader::identifier):

  • loader/MainResourceLoader.h:

(MainResourceLoader):

  • loader/cache/CachedRawResource.cpp:

(WebCore::CachedRawResource::didAddClient):
(WebCore::CachedRawResource::willSendRequest):
(WebCore::CachedRawResource::canReuse):

  • loader/cache/CachedRawResource.h:

(CachedRawResource):

  • loader/cache/CachedResource.cpp:

(WebCore::CachedResource::addClientToSet):

  • loader/cache/CachedResource.h:

(CachedResource):

  • loader/cache/CachedResourceLoader.cpp:

(WebCore::CachedResourceLoader::determineRevalidationPolicy):

  • testing/Internals.cpp:
  • testing/Internals.h:

(Internals):

  • testing/Internals.idl:

Source/WebKit/win:

  • WebKit.vcproj/WebKitExports.def.in:

LayoutTests:

  • http/tests/cache/cached-main-resource-expected.txt: Removed.
  • http/tests/cache/cached-main-resource.html: Removed.
  • http/tests/cache/resources/cacheable-iframe.php: Removed.
  • http/tests/inspector/resource-har-pages-expected.txt:
  • http/tests/loading/redirect-methods-expected.txt:
  • http/tests/misc/favicon-loads-with-images-disabled-expected.txt:
  • http/tests/misc/link-rel-icon-beforeload-expected.txt:
Location:
trunk
Files:
3 deleted
24 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r140021 r140105  
     12013-01-18  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r140005.
     4        http://trac.webkit.org/changeset/140005
     5        https://bugs.webkit.org/show_bug.cgi?id=107235
     6
     7        broke downstream Chromium interactive_ui_tests (Requested by
     8        dominicc on #webkit).
     9
     10        * Source/autotools/symbols.filter:
     11
    1122013-01-17  Martin Robinson  <mrobinson@igalia.com>
    213

  • trunk/LayoutTests/ChangeLog

    r140104 r140105  
     12013-01-18  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r140005.
     4        http://trac.webkit.org/changeset/140005
     5        https://bugs.webkit.org/show_bug.cgi?id=107235
     6
     7        broke downstream Chromium interactive_ui_tests (Requested by
     8        dominicc on #webkit).
     9
     10        * http/tests/cache/cached-main-resource-expected.txt: Removed.
     11        * http/tests/cache/cached-main-resource.html: Removed.
     12        * http/tests/cache/resources/cacheable-iframe.php: Removed.
     13        * http/tests/inspector/resource-har-pages-expected.txt:
     14        * http/tests/loading/redirect-methods-expected.txt:
     15        * http/tests/misc/favicon-loads-with-images-disabled-expected.txt:
     16        * http/tests/misc/link-rel-icon-beforeload-expected.txt:
     17
    1182013-01-18  Yoshifumi Inoue  <yosin@chromium.org>
    219

  • trunk/LayoutTests/http/tests/inspector/resource-har-pages-expected.txt

    r140005 r140105  
    11Tests conversion of Inspector's resource representation into HAR format.
    22
     3Page reloaded.
    34{
    45    0 : {
    … …  
    2829page: page_1 url: http://127.0.0.1:8000/inspector/resources/source1.js
    2930page: page_1 url: http://127.0.0.1:8000/resources/redirect.php?url=/inspector/resources/har-pages-navigation-target.html
    30 Page reloaded.
    3131

  • trunk/LayoutTests/http/tests/loading/redirect-methods-expected.txt

    r140005 r140105  
    4343frame "1" - didCancelClientRedirectForFrame
    4444frame "1" - didCommitLoadForFrame
    45 http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
    4645frame "1" - didFinishDocumentLoadForFrame
    4746frame "1" - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/redirect-methods-result.php
    4847frame "1" - didHandleOnloadEventsForFrame
    4948frame "1" - didFinishLoadForFrame
     49http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
    5050frame "1" - didStartProvisionalLoadForFrame
    5151http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/redirect-methods-result.php, main document URL http://127.0.0.1:8000/loading/redirect-methods.html, http method POST> redirectResponse (null)
    … …  
    7070frame "2" - didCancelClientRedirectForFrame
    7171frame "2" - didCommitLoadForFrame
    72 http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
    7372frame "2" - didFinishDocumentLoadForFrame
    7473frame "2" - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/redirect-methods-result.php
    7574frame "2" - didHandleOnloadEventsForFrame
    7675frame "2" - didFinishLoadForFrame
     76http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
    7777frame "2" - didStartProvisionalLoadForFrame
    7878http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/redirect-methods-result.php, main document URL http://127.0.0.1:8000/loading/redirect-methods.html, http method POST> redirectResponse (null)
    … …  
    9797frame "3" - didCancelClientRedirectForFrame
    9898frame "3" - didCommitLoadForFrame
    99 http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
    10099frame "3" - didFinishDocumentLoadForFrame
    101100frame "3" - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/redirect-methods-result.php
    102101frame "3" - didHandleOnloadEventsForFrame
    103102frame "3" - didFinishLoadForFrame
     103http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
    104104frame "3" - didStartProvisionalLoadForFrame
    105105http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/redirect-methods-result.php, main document URL http://127.0.0.1:8000/loading/redirect-methods.html, http method POST> redirectResponse (null)

  • trunk/LayoutTests/http/tests/misc/favicon-loads-with-images-disabled-expected.txt

    r140005 r140105  
    22http://127.0.0.1:8000/misc/favicon-loads-with-images-disabled.html - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/misc/favicon-loads-with-images-disabled.html, main document URL http://127.0.0.1:8000/misc/favicon-loads-with-images-disabled.html, http method GET> redirectResponse (null)
    33http://127.0.0.1:8000/misc/favicon-loads-with-images-disabled.html - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/misc/favicon-loads-with-images-disabled.html, http status code 200>
    4 http://127.0.0.1:8000/misc/favicon-loads-with-images-disabled.html - didFinishLoading
    54Radar 6973106 and https://bugs.webkit.org/show_bug.cgi?id=27896 - Favicons still load when automatic image loading is disabled.
    65This test uses DRT's resource load delegate callback mode to see if the favicon is loaded even when image loading is off.

  • trunk/LayoutTests/http/tests/misc/link-rel-icon-beforeload-expected.txt

    r140005 r140105  
    22http://127.0.0.1:8000/misc/link-rel-icon-beforeload.html - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/misc/link-rel-icon-beforeload.html, main document URL http://127.0.0.1:8000/misc/link-rel-icon-beforeload.html, http method GET> redirectResponse (null)
    33http://127.0.0.1:8000/misc/link-rel-icon-beforeload.html - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/misc/link-rel-icon-beforeload.html, http status code 200>
    4 http://127.0.0.1:8000/misc/link-rel-icon-beforeload.html - didFinishLoading
    54http://127.0.0.1:8000/favicon.ico - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/favicon.ico, main document URL http://127.0.0.1:8000/misc/link-rel-icon-beforeload.html, http method GET> redirectResponse (null)
    65This test should not show a request for the favicon dont-load-this.ico, since the beforeload handler on the favicon link returns false. Therefore, if the resource request list below shows a request for dont-load-this.ico, then this test has failed.

  • trunk/Source/WebCore/ChangeLog

    r140104 r140105  
     12013-01-18  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r140005.
     4        http://trac.webkit.org/changeset/140005
     5        https://bugs.webkit.org/show_bug.cgi?id=107235
     6
     7        broke downstream Chromium interactive_ui_tests (Requested by
     8        dominicc on #webkit).
     9
     10        * WebCore.exp.in:
     11        * dom/Document.cpp:
     12        * dom/Document.h:
     13        (WebCore::Document::documentElement):
     14        * loader/FrameLoader.cpp:
     15        (WebCore::FrameLoader::loadedResourceFromMemoryCache):
     16        * loader/MainResourceLoader.cpp:
     17        (WebCore::MainResourceLoader::MainResourceLoader):
     18        (WebCore::MainResourceLoader::receivedError):
     19        (WebCore::MainResourceLoader::willSendRequest):
     20        (WebCore::MainResourceLoader::responseReceived):
     21        (WebCore::MainResourceLoader::didFinishLoading):
     22        (WebCore::MainResourceLoader::load):
     23        (WebCore::MainResourceLoader::identifier):
     24        * loader/MainResourceLoader.h:
     25        (MainResourceLoader):
     26        * loader/cache/CachedRawResource.cpp:
     27        (WebCore::CachedRawResource::didAddClient):
     28        (WebCore::CachedRawResource::willSendRequest):
     29        (WebCore::CachedRawResource::canReuse):
     30        * loader/cache/CachedRawResource.h:
     31        (CachedRawResource):
     32        * loader/cache/CachedResource.cpp:
     33        (WebCore::CachedResource::addClientToSet):
     34        * loader/cache/CachedResource.h:
     35        (CachedResource):
     36        * loader/cache/CachedResourceLoader.cpp:
     37        (WebCore::CachedResourceLoader::determineRevalidationPolicy):
     38        * testing/Internals.cpp:
     39        * testing/Internals.h:
     40        (Internals):
     41        * testing/Internals.idl:
     42
    1432013-01-18  Yoshifumi Inoue  <yosin@chromium.org>
    244

  • trunk/Source/WebCore/WebCore.exp.in

    r140087 r140105  
    146146__ZN7WebCore11MemoryCache13setCapacitiesEjjj
    147147__ZN7WebCore11MemoryCache14evictResourcesEv
    148 __ZN7WebCore11MemoryCache14resourceForURLERKNS_4KURLE
    149148__ZN7WebCore11MemoryCache19getOriginsWithCacheERN3WTF7HashSetINS1_6RefPtrINS_14SecurityOriginEEENS_18SecurityOriginHashENS1_10HashTraitsIS5_EEEE
    150149__ZN7WebCore11MemoryCache25removeResourcesWithOriginEPNS_14SecurityOriginE

  • trunk/Source/WebCore/dom/Document.cpp

    r140005 r140105  
    815815}
    816816
    817 bool Document::hasManifest() const
    818 {
    819     return documentElement() && documentElement()->hasTagName(htmlTag) && documentElement()->hasAttribute(manifestAttr);
    820 }
    821 
    822817void Document::childrenChanged(bool changedByParser, Node* beforeChange, Node* afterChange, int childCountDelta)
    823818{

  • trunk/Source/WebCore/dom/Document.h

    r140005 r140105  
    341341        return m_documentElement.get();
    342342    }
    343 
    344     bool hasManifest() const;
    345343   
    346344    virtual PassRefPtr<Element> createElement(const AtomicString& tagName, ExceptionCode&);

  • trunk/Source/WebCore/loader/FrameLoader.cpp

    r140005 r140105  
    28942894        return;
    28952895
    2896     // Main resource delegate messages are synthesized in MainResourceLoader, so we must not send them here.
    2897     if (resource->type() == CachedResource::MainResource)
    2898         return;
    2899 
    29002896    if (!page->areMemoryCacheClientCallsEnabled()) {
    29012897        InspectorInstrumentation::didLoadResourceFromMemoryCache(page, m_documentLoader.get(), resource);

  • trunk/Source/WebCore/loader/MainResourceLoader.cpp

    r140005 r140105  
    4747#include "HistoryItem.h"
    4848#include "InspectorInstrumentation.h"
    49 #include "MemoryCache.h"
    5049#include "Page.h"
    5150#include "ProgressTracker.h"
    … …  
    7574    , m_waitingForContentPolicy(false)
    7675    , m_timeOfLastDataReceived(0.0)
    77     , m_identifierForLoadWithoutResourceLoader(0)
     76    , m_substituteDataLoadIdentifier(0)
    7877#if PLATFORM(MAC) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
    7978    , m_filter(0)
    … …  
    101100    RefPtr<Frame> protectFrame(m_documentLoader->frame());
    102101
    103     if (m_identifierForLoadWithoutResourceLoader) {
     102    if (m_substituteDataLoadIdentifier) {
    104103        ASSERT(!loader());
    105         frameLoader()->client()->dispatchDidFailLoading(documentLoader(), m_identifierForLoadWithoutResourceLoader, error);
     104        frameLoader()->client()->dispatchDidFailLoading(documentLoader(), m_substituteDataLoadIdentifier, error);
    106105    }
    107106
    … …  
    288287        documentLoader()->applicationCacheHost()->maybeLoadMainResourceForRedirect(newRequest, m_substituteData);
    289288        if (m_substituteData.isValid())
    290             m_identifierForLoadWithoutResourceLoader = identifier();
     289            m_substituteDataLoadIdentifier = identifier();
    291290    }
    292291
    … …  
    394393{
    395394    ASSERT_UNUSED(resource, m_resource == resource);
    396     bool willLoadFallback = documentLoader()->applicationCacheHost()->maybeLoadFallbackForMainResponse(request(), r);
    397 
    398     // The memory cache doesn't understand the application cache or its caching rules. So if a main resource is served
    399     // from the application cache, ensure we don't save the result for future use.
    400     bool shouldRemoveResourceFromCache = willLoadFallback;
    401 #if PLATFORM(CHROMIUM)
    402     // chromium's ApplicationCacheHost implementation always returns true for maybeLoadFallbackForMainResponse(). However, all responses loaded
    403     // from appcache will have a non-zero appCacheID().
    404     if (r.appCacheID())
    405         shouldRemoveResourceFromCache = true;
    406 #endif
    407     if (shouldRemoveResourceFromCache)
    408         memoryCache()->remove(m_resource.get());
    409 
    410     if (willLoadFallback)
     395    if (documentLoader()->applicationCacheHost()->maybeLoadFallbackForMainResponse(request(), r))
    411396        return;
    412397
    … …  
    556541    if (!loader()) {
    557542        frameLoader()->notifier()->dispatchDidFinishLoading(documentLoader(), identifier(), finishTime);
    558         m_identifierForLoadWithoutResourceLoader = 0;
     543        m_substituteDataLoadIdentifier = 0;
    559544    }
    560545
    … …  
    578563    documentLoader()->finishedLoading();
    579564
    580     // If the document specified an application cache manifest, it violates the author's intent if we store it in the memory cache
    581     // and deny the appcache the chance to intercept it in the future, so remove from the memory cache.
    582     if (Frame* frame = documentLoader()->frame()) {
    583         if (m_resource && frame->document()->hasManifest())
    584             memoryCache()->remove(m_resource.get());
    585     }
    586 
    587565    dl->applicationCacheHost()->finishedLoadingMainResource();
    588566}
    … …  
    694672
    695673    if (m_substituteData.isValid()) {
    696         m_identifierForLoadWithoutResourceLoader = m_documentLoader->frame()->page()->progress()->createUniqueIdentifier();
    697         frameLoader()->notifier()->assignIdentifierToInitialRequest(m_identifierForLoadWithoutResourceLoader, documentLoader(), request);
    698         frameLoader()->notifier()->dispatchWillSendRequest(documentLoader(), m_identifierForLoadWithoutResourceLoader, request, ResourceResponse());
     674        m_substituteDataLoadIdentifier = m_documentLoader->frame()->page()->progress()->createUniqueIdentifier();
     675        frameLoader()->notifier()->assignIdentifierToInitialRequest(m_substituteDataLoadIdentifier, documentLoader(), request);
     676        frameLoader()->notifier()->dispatchWillSendRequest(documentLoader(), m_substituteDataLoadIdentifier, request, ResourceResponse());
    699677        handleSubstituteDataLoadSoon(request);
    700678        return;
    … …  
    709687        return;
    710688    }
    711     if (!loader()) {
    712         m_identifierForLoadWithoutResourceLoader = m_documentLoader->frame()->page()->progress()->createUniqueIdentifier();
    713         frameLoader()->notifier()->assignIdentifierToInitialRequest(m_identifierForLoadWithoutResourceLoader, documentLoader(), request);
    714         frameLoader()->notifier()->dispatchWillSendRequest(documentLoader(), m_identifierForLoadWithoutResourceLoader, request, ResourceResponse());
    715     }
    716689    m_resource->addClient(this);
    717690
    718     // A bunch of headers are set when the underlying ResourceLoader is created, and DocumentLoader::m_request needs to include those.
     691    // We need to wait until after requestMainResource() is called to setRequest(), because there are a bunch of headers set when
     692    // the underlying ResourceLoader is created, and DocumentLoader::m_request needs to include those. However, the cache will
     693    // strip the fragment identifier (which DocumentLoader::m_request should also include), so add that back in.
    719694    if (loader())
    720695        request = loader()->originalRequest();
    721     // If there was a fragment identifier on initialRequest, the cache will have stripped it. DocumentLoader::m_request should include
    722     // the fragment identifier, so add that back in.
    723     if (equalIgnoringFragmentIdentifier(initialRequest.url(), request.url()))
    724         request.setURL(initialRequest.url());
    725696    documentLoader()->setRequest(request);
    726697}
    … …  
    750721unsigned long MainResourceLoader::identifier() const
    751722{
    752     ASSERT(!m_identifierForLoadWithoutResourceLoader || !loader() || !loader()->identifier());
    753     if (m_identifierForLoadWithoutResourceLoader)
    754         return m_identifierForLoadWithoutResourceLoader;
     723    ASSERT(!m_substituteDataLoadIdentifier || !loader() || !loader()->identifier());
     724    if (m_substituteDataLoadIdentifier)
     725        return m_substituteDataLoadIdentifier;
    755726    if (ResourceLoader* resourceLoader = loader())
    756727        return resourceLoader->identifier();

  • trunk/Source/WebCore/loader/MainResourceLoader.h

    r140005 r140105  
    129129    bool m_waitingForContentPolicy;
    130130    double m_timeOfLastDataReceived;
    131     unsigned long m_identifierForLoadWithoutResourceLoader;
     131    unsigned long m_substituteDataLoadIdentifier;
    132132
    133133#if PLATFORM(MAC) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080

  • trunk/Source/WebCore/loader/cache/CachedRawResource.cpp

    r140005 r140105  
    8181void CachedRawResource::didAddClient(CachedResourceClient* c)
    8282{
    83     if (!hasClient(c))
     83    if (m_response.isNull() || !hasClient(c))
    8484        return;
    8585    // The calls to the client can result in events running, potentially causing
    … …  
    8888    CachedResourceHandle<CachedRawResource> protect(this);
    8989    CachedRawResourceClient* client = static_cast<CachedRawResourceClient*>(c);
    90     size_t redirectCount = m_redirectChain.size();
    91     for (size_t i = 0; i < redirectCount; i++) {
    92         RedirectPair redirect = m_redirectChain[i];
    93         ResourceRequest request(redirect.m_request);
    94         client->redirectReceived(this, request, redirect.m_redirectResponse);
    95         if (!hasClient(c))
    96             return;
    97     }
    98     ASSERT(redirectCount == m_redirectChain.size());
    99 
    100     if (!m_response.isNull())
    101         client->responseReceived(this, m_response);
     90    client->responseReceived(this, m_response);
    10291    if (!hasClient(c))
    10392        return;
    … …  
    122111        while (CachedRawResourceClient* c = w.next())
    123112            c->redirectReceived(this, request, response);
    124         m_redirectChain.append(RedirectPair(request, response));
    125113    }
    126114    CachedResource::willSendRequest(request, response);
    … …  
    207195            return false;
    208196    }
    209 
    210     for (size_t i = 0; i < m_redirectChain.size(); i++) {
    211         if (m_redirectChain[i].m_redirectResponse.cacheControlContainsNoStore())
    212             return false;
    213     }
    214 
    215197    return true;
    216198}

  • trunk/Source/WebCore/loader/cache/CachedRawResource.h

    r140005 r140105  
    4949    void clear();
    5050
    51     virtual bool canReuse(const ResourceRequest&) const;
     51    bool canReuse(const ResourceRequest&) const;
    5252
    5353    virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
    … …  
    6868
    6969    unsigned long m_identifier;
    70 
    71     struct RedirectPair {
    72     public:
    73         explicit RedirectPair(const ResourceRequest& request, const ResourceResponse& redirectResponse)
    74             : m_request(request)
    75             , m_redirectResponse(redirectResponse)
    76         {
    77         }
    78 
    79         const ResourceRequest m_request;
    80         const ResourceResponse m_redirectResponse;
    81     };
    82 
    83     Vector<RedirectPair> m_redirectChain;
    8470};
    8571

  • trunk/Source/WebCore/loader/cache/CachedResource.cpp

    r140005 r140105  
    498498        memoryCache()->addToLiveResourcesSize(this);
    499499
    500     if ((m_type == RawResource || m_type == MainResource) && !m_response.isNull() && !m_proxyResource) {
    501         // Certain resources (especially XHRs and main resources) do crazy things if an asynchronous load returns
     500    if (m_type == RawResource && !m_response.isNull() && !m_proxyResource) {
     501        // Certain resources (especially XHRs) do crazy things if an asynchronous load returns
    502502        // synchronously (e.g., scripts may not have set all the state they need to handle the load).
    503503        // Therefore, rather than immediately sending callbacks on a cache hit like other CachedResources,

  • trunk/Source/WebCore/loader/cache/CachedResource.h

    r140005 r140105  
    259259    virtual void reportMemoryUsage(MemoryObjectInfo*) const;
    260260
    261     virtual bool canReuse(const ResourceRequest&) const { return true; }
    262 
    263261protected:
    264262    virtual void checkNotify();

  • trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp

    r140005 r140105  
    541541    }
    542542
    543     if (!existingResource->canReuse(request))
     543    if (existingResource->type() == CachedResource::MainResource)
     544        return Reload;
     545
     546    if (existingResource->type() == CachedResource::RawResource && !static_cast<CachedRawResource*>(existingResource)->canReuse(request))
    544547        return Reload;
    545548

  • trunk/Source/WebCore/testing/Internals.cpp

    r140005 r140105  
    6666#include "Language.h"
    6767#include "MallocStatistics.h"
    68 #include "MemoryCache.h"
    6968#include "MockPagePopupDriver.h"
    7069#include "NodeRenderingContext.h"
    … …  
    293292
    294293    return document->cachedResourceLoader()->isPreloaded(url);
    295 }
    296 
    297 bool Internals::isLoadingFromMemoryCache(const String& url)
    298 {
    299     if (!contextDocument())
    300         return false;
    301     CachedResource* resource = memoryCache()->resourceForURL(contextDocument()->completeURL(url));
    302     return resource && resource->status() == CachedResource::Cached;
    303294}
    304295

  • trunk/Source/WebCore/testing/Internals.h

    r140005 r140105  
    7373
    7474    bool isPreloaded(Document*, const String& url);
    75     bool isLoadingFromMemoryCache(const String& url);
    7675
    7776    size_t numberOfScopedHTMLStyleChildren(const Node*, ExceptionCode&) const;

  • trunk/Source/WebCore/testing/Internals.idl

    r140005 r140105  
    3131    DOMString elementRenderTreeAsText(in Element element) raises(DOMException);
    3232    boolean isPreloaded(in Document document, in DOMString url);
    33     boolean isLoadingFromMemoryCache(in DOMString url);
    3433
    3534    unsigned long numberOfScopedHTMLStyleChildren(in Node scope) raises(DOMException);

  • trunk/Source/WebKit/win/ChangeLog

    r140005 r140105  
     12013-01-18  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r140005.
     4        http://trac.webkit.org/changeset/140005
     5        https://bugs.webkit.org/show_bug.cgi?id=107235
     6
     7        broke downstream Chromium interactive_ui_tests (Requested by
     8        dominicc on #webkit).
     9
     10        * WebKit.vcproj/WebKitExports.def.in:
     11
    1122013-01-17  Nate Chapin  <japhet@chromium.org>
    213

  • trunk/Source/WebKit/win/WebKit.vcproj/WebKitExports.def.in

    r140005 r140105  
    561561        ?cacheDOMStructure@WebCore@@YAPAVStructure@JSC@@PAVJSDOMGlobalObject@1@PAV23@PBUClassInfo@3@@Z
    562562        ?childItemWithTarget@HistoryItem@WebCore@@QBEPAV12@ABVString@WTF@@@Z
    563         ?completeURL@Document@WebCore@@QBE?AVKURL@2@ABVString@WTF@@@Z
    564563        ?create@Range@WebCore@@SA?AV?$PassRefPtr@VRange@WebCore@@@WTF@@V?$PassRefPtr@VDocument@WebCore@@@4@V?$PassRefPtr@VNode@WebCore@@@4@H1H@Z
    565564        ?create@SerializedScriptValue@WebCore@@SA?AV?$PassRefPtr@VSerializedScriptValue@WebCore@@@WTF@@ABVString@4@@Z
    … …  
    13921391        ?mainThreadScrollingReasonsAsText@Page@WebCore@@QAE?AVString@WTF@@XZ
    13931392        ?markersFor@DocumentMarkerController@WebCore@@QAE?AV?$Vector@PAVDocumentMarker@WebCore@@$0A@@WTF@@PAVNode@2@VMarkerTypes@DocumentMarker@2@@Z
    1394         ?memoryCache@WebCore@@YAPAVMemoryCache@1@XZ
    13951393        ?nextSibling@ComposedShadowTreeWalker@WebCore@@QAEXXZ
    13961394        ?firstChild@ComposedShadowTreeWalker@WebCore@@QAEXXZ
    … …  
    14121410        ?remove@String@WTF@@QAEXIH@Z
    14131411        ?removedLastRef@Node@WebCore@@AAEXXZ
    1414         ?resourceForURL@MemoryCache@WebCore@@QAEPAVCachedResource@2@ABVKURL@2@@Z
    14151412        ?reverseFind@StringImpl@WTF@@QAEI_WI@Z
    14161413        ?saveDocumentAndScrollState@HistoryController@WebCore@@QAEXXZ

  • trunk/Source/autotools/symbols.filter

    r140005 r140105  
    5151_ZN7WebCore10ClientRectC1ERKNS_7IntRectE;
    5252_ZN7WebCore10ShadowRoot6createEPNS_7ElementERi;
    53 _ZN7WebCore11memoryCacheEv;
    5453_ZN7WebCore11EventTarget17toGeneratedStreamEv;
    5554_ZN7WebCore11EventTarget8toStreamEv;
    5655_ZN7WebCore11HistoryItem16setDocumentStateERKN3WTF6VectorINS1_6StringELj0EEE;
    5756_ZN7WebCore11HistoryItem16setDocumentStateERKN3WTF6VectorINS1_6StringELm0EEE;
    58 _ZN7WebCore11MemoryCache14resourceForURLERKNS_4KURLE;
    5957_ZN7WebCore12TextIterator26rangeFromLocationAndLengthEPNS_13ContainerNodeEiib;
    6058_ZN7WebCore12TextIterator29getLocationAndLengthFromRangeEPNS_7ElementEPKNS_5RangeERjS6_;
    … …  
    149147_ZNK7WebCore6JSNode21pushEventHandlerScopeEPN3JSC9ExecStateEPNS1_14ScopeChainNodeE;
    150148_ZNK7WebCore7Element6shadowEv;
    151 _ZNK7WebCore8Document11completeURLERKN3WTF6StringE;
    152149_ZNK7WebCore8Document4pageEv;
    153150_ZNK7WebCore8Document8settingsEv;
Note: See TracChangeset for help on using the changeset viewer.