Skip to content
Permalink
Browse files
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:

Canonical link: https://commits.webkit.org/125468@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@140105 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
WebKit Review Bot authored and dominiccooney committed Jan 18, 2013
1 parent 3dc5b9e commit 3a6a8d9b5cddd553db0ab212ac87e2fb67d41050
Show file tree
Hide file tree
Showing 27 changed files with 110 additions and 157 deletions.
@@ -1,3 +1,14 @@
2013-01-18 Sheriff Bot <webkit.review.bot@gmail.com>

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).

* Source/autotools/symbols.filter:

2013-01-17 Martin Robinson <mrobinson@igalia.com>

[GTK] Build with LevelDB when IndexedDB is enabled
@@ -1,3 +1,20 @@
2013-01-18 Sheriff Bot <webkit.review.bot@gmail.com>

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).

* 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:

2013-01-18 Yoshifumi Inoue <yosin@chromium.org>

REGRESSION(r137726): Spring Loaded Pan Scrolling doesn't stop

This file was deleted.

This file was deleted.

This file was deleted.

@@ -1,5 +1,6 @@
Tests conversion of Inspector's resource representation into HAR format.

Page reloaded.
{
0 : {
id : <string>
@@ -27,5 +28,4 @@ page: page_1 url: http://127.0.0.1:8000/inspector/resources/har-pages-iframe.htm
page: page_1 url: http://127.0.0.1:8000/inspector/resources/har-pages-navigation-target.html
page: page_1 url: http://127.0.0.1:8000/inspector/resources/source1.js
page: page_1 url: http://127.0.0.1:8000/resources/redirect.php?url=/inspector/resources/har-pages-navigation-target.html
Page reloaded.

@@ -42,11 +42,11 @@ http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - willSendReq
http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/redirect-methods-form.html, http status code 200>
frame "1" - didCancelClientRedirectForFrame
frame "1" - didCommitLoadForFrame
http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
frame "1" - didFinishDocumentLoadForFrame
frame "1" - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/redirect-methods-result.php
frame "1" - didHandleOnloadEventsForFrame
frame "1" - didFinishLoadForFrame
http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
frame "1" - didStartProvisionalLoadForFrame
http://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)
http://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?redirected=true, main document URL http://127.0.0.1:8000/loading/redirect-methods.html, http method GET> redirectResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/redirect-methods-result.php, http status code 302>
@@ -69,11 +69,11 @@ http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - willSendReq
http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/redirect-methods-form.html, http status code 200>
frame "2" - didCancelClientRedirectForFrame
frame "2" - didCommitLoadForFrame
http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
frame "2" - didFinishDocumentLoadForFrame
frame "2" - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/redirect-methods-result.php
frame "2" - didHandleOnloadEventsForFrame
frame "2" - didFinishLoadForFrame
http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
frame "2" - didStartProvisionalLoadForFrame
http://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)
http://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?redirected=true, main document URL http://127.0.0.1:8000/loading/redirect-methods.html, http method GET> redirectResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/redirect-methods-result.php, http status code 303>
@@ -96,11 +96,11 @@ http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - willSendReq
http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/redirect-methods-form.html, http status code 200>
frame "3" - didCancelClientRedirectForFrame
frame "3" - didCommitLoadForFrame
http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
frame "3" - didFinishDocumentLoadForFrame
frame "3" - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/redirect-methods-result.php
frame "3" - didHandleOnloadEventsForFrame
frame "3" - didFinishLoadForFrame
http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
frame "3" - didStartProvisionalLoadForFrame
http://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)
http://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?redirected=true, main document URL http://127.0.0.1:8000/loading/redirect-methods.html, http method POST> redirectResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/redirect-methods-result.php, http status code 307>
@@ -1,7 +1,6 @@
<unknown> - didFinishLoading
http://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)
http://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>
http://127.0.0.1:8000/misc/favicon-loads-with-images-disabled.html - didFinishLoading
Radar 6973106 and https://bugs.webkit.org/show_bug.cgi?id=27896 - Favicons still load when automatic image loading is disabled.
This test uses DRT's resource load delegate callback mode to see if the favicon is loaded even when image loading is off.

@@ -1,6 +1,5 @@
<unknown> - didFinishLoading
http://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)
http://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>
http://127.0.0.1:8000/misc/link-rel-icon-beforeload.html - didFinishLoading
http://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)
This 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.
@@ -1,3 +1,45 @@
2013-01-18 Sheriff Bot <webkit.review.bot@gmail.com>

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).

* 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:

2013-01-18 Yoshifumi Inoue <yosin@chromium.org>

REGRESSION(r137726): Spring Loaded Pan Scrolling doesn't stop
@@ -145,7 +145,6 @@ __ZN7WebCore11MemoryCache11setDisabledEb
__ZN7WebCore11MemoryCache13getStatisticsEv
__ZN7WebCore11MemoryCache13setCapacitiesEjjj
__ZN7WebCore11MemoryCache14evictResourcesEv
__ZN7WebCore11MemoryCache14resourceForURLERKNS_4KURLE
__ZN7WebCore11MemoryCache19getOriginsWithCacheERN3WTF7HashSetINS1_6RefPtrINS_14SecurityOriginEEENS_18SecurityOriginHashENS1_10HashTraitsIS5_EEEE
__ZN7WebCore11MemoryCache25removeResourcesWithOriginEPNS_14SecurityOriginE
__ZN7WebCore11URLWithDataEP6NSDataP5NSURL
@@ -814,11 +814,6 @@ DOMImplementation* Document::implementation()
return m_implementation.get();
}

bool Document::hasManifest() const
{
return documentElement() && documentElement()->hasTagName(htmlTag) && documentElement()->hasAttribute(manifestAttr);
}

void Document::childrenChanged(bool changedByParser, Node* beforeChange, Node* afterChange, int childCountDelta)
{
ContainerNode::childrenChanged(changedByParser, beforeChange, afterChange, childCountDelta);
@@ -340,8 +340,6 @@ class Document : public ContainerNode, public TreeScope, public ScriptExecutionC
{
return m_documentElement.get();
}

bool hasManifest() const;

virtual PassRefPtr<Element> createElement(const AtomicString& tagName, ExceptionCode&);
PassRefPtr<DocumentFragment> createDocumentFragment();
@@ -2893,10 +2893,6 @@ void FrameLoader::loadedResourceFromMemoryCache(CachedResource* resource)
if (!resource->shouldSendResourceLoadCallbacks() || m_documentLoader->haveToldClientAboutLoad(resource->url()))
return;

// Main resource delegate messages are synthesized in MainResourceLoader, so we must not send them here.
if (resource->type() == CachedResource::MainResource)
return;

if (!page->areMemoryCacheClientCallsEnabled()) {
InspectorInstrumentation::didLoadResourceFromMemoryCache(page, m_documentLoader.get(), resource);
m_documentLoader->recordMemoryCacheLoadForFutureClientNotification(resource->url());

0 comments on commit 3a6a8d9

Please sign in to comment.