2011-06-22 Nate Chapin <japhet@chromium.org>

        Reviewed by Adam Barth.

        Add symbols required for window.internals.
        https://bugs.webkit.org/show_bug.cgi?id=62066

        * Source/autotools/symbols.filter:
2011-06-22  Nate Chapin  <japhet@chromium.org>

        Reviewed by Adam Barth.

        Test updates for https://bugs.webkit.org/show_bug.cgi?id=62066.

        * fast/preloader/scan-body-from-head-import.html: Use window.internals.
        * fast/preloader/scan-body-from-head-script.html: Use window.internals.
        * http/tests/loading/cross-origin-XHR-willLoadRequest-expected.txt:
        * http/tests/loading/cross-origin-XHR-willLoadRequest.html:
        * http/tests/loading/preload-append-scan-expected.txt:
        * http/tests/loading/preload-append-scan.php: Use window.internals.
        * http/tests/misc/favicon-loads-with-icon-loading-override-expected.txt:
        * http/tests/misc/link-rel-icon-beforeload-expected.txt:
        * platform/chromium-linux/fast/preloader/scan-body-from-head-script-expected.txt:  Removed.
2011-06-22  Nate Chapin  <japhet@chromium.org>

        Reviewed by Adam Barth.

        Don't let all subresources keep isLoadingInAPISense() from
        returning false, only requests that affect
        CachedResourceRequest::requestCount().

        Also, add a callback to Internals to determine whether
        a resource has been preloaded.

        https://bugs.webkit.org/show_bug.cgi?id=62066

        * WebCore.exp.in:
        * dom/Document.cpp: Add m_loadEventFinished.
        * dom/Document.h:
        * loader/DocumentLoader.cpp:
        (WebCore::DocumentLoader::isLoadingInAPISense):
        * loader/cache/CachedResourceLoader.cpp:
        (WebCore::CachedResourceLoader::isPreloaded):
        * loader/cache/CachedResourceLoader.h:
        * testing/Internals.cpp:
        (WebCore::Internals::isPreloaded):
        * testing/Internals.h:
        * testing/Internals.idl:
2011-06-22  Nate Chapin  <japhet@chromium.org>

        Reviewed by Adam Barth.

        Add win symbols for new window.internals functionality.
        https://bugs.webkit.org/show_bug.cgi?id=62066

        * win/WebKit2.def:
2011-06-22  Nate Chapin  <japhet@chromium.org>

        Reviewed by Adam Barth.

        Add libsoup to libWebCoreInternals build.
        https://bugs.webkit.org/show_bug.cgi?id=62066

        * GNUmakefile.am:

Canonical link: https://commits.webkit.org/78813@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@89503 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog

@@ -1,3 +1,12 @@
+2011-06-22  Nate Chapin  <japhet@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Add symbols required for window.internals.
+        https://bugs.webkit.org/show_bug.cgi?id=62066
+
+        * Source/autotools/symbols.filter:
+
 2011-06-22  Martin Robinson  <mrobinson@igalia.com>
 
         Reviewed by Adam Roben.

LayoutTests/ChangeLog

@@ -1,3 +1,19 @@
+2011-06-22  Nate Chapin  <japhet@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Test updates for https://bugs.webkit.org/show_bug.cgi?id=62066.
+
+        * fast/preloader/scan-body-from-head-import.html: Use window.internals.
+        * fast/preloader/scan-body-from-head-script.html: Use window.internals.
+        * http/tests/loading/cross-origin-XHR-willLoadRequest-expected.txt:
+        * http/tests/loading/cross-origin-XHR-willLoadRequest.html:
+        * http/tests/loading/preload-append-scan-expected.txt:
+        * http/tests/loading/preload-append-scan.php: Use window.internals.
+        * http/tests/misc/favicon-loads-with-icon-loading-override-expected.txt:
+        * http/tests/misc/link-rel-icon-beforeload-expected.txt:
+        * platform/chromium-linux/fast/preloader/scan-body-from-head-script-expected.txt:  Removed.
+
 2011-06-22  Jessie Berlin  <jberlin@apple.com>
 
         [WebKit2 Tests] plugins/npruntime/embed-property-equality.html failing since introduction in

LayoutTests/fast/preloader/scan-body-from-head-import-expected.txt

@@ -1,5 +1,3 @@
-style1.css has MIME type text/css
-image1.png has MIME type image/png
 
 This tests that resources in the body which block parsing (script, css) are preloaded
 ahead of other resources (images). It requires DumpRenderTree to see the log of what
@@ -10,4 +8,4 @@ resources are loaded.
 </style>
 </body>
 </html>
-
+PASS

LayoutTests/fast/preloader/scan-body-from-head-import.html

@@ -1,10 +1,19 @@
 <html>
 <head>
 <script>
-if (window.layoutTestController) {
+if (window.layoutTestController)
     layoutTestController.dumpAsText();
-    layoutTestController.dumpResourceResponseMIMETypes();
+
+function checkForPreload() {
+    var result;
+    if (internals.isPreloaded(document, "resources/image1.png") && internals.isPreloaded(document, "resources/style1.css"))
+        result = "PASS";
+    else
+        result = "FAIL";
+    document.getElementsByTagName("body")[0].appendChild(document.createTextNode(result));
 }
+
+window.addEventListener("DOMContentLoaded", checkForPreload, false);
 </script>
 <script src=resources/non-existant.js></script>
 </head>

LayoutTests/fast/preloader/scan-body-from-head-script-expected.txt

@@ -1,5 +1,3 @@
-script1.js has MIME type application/x-javascript
-image1.png has MIME type image/png
 
 This tests that resources in the body which block parsing (script, css) are preloaded
 ahead of other resources (images). It requires DumpRenderTree to see the log of what
@@ -8,4 +6,4 @@ resources are loaded.
 <script src=resources/script1.js></script>
 </body>
 </html>
-
+PASS

LayoutTests/fast/preloader/scan-body-from-head-script.html

@@ -1,10 +1,19 @@
 <html>
 <head>
 <script>
-if (window.layoutTestController) {
+if (window.layoutTestController)
     layoutTestController.dumpAsText();
-    layoutTestController.dumpResourceResponseMIMETypes();
+
+function checkForPreload() {
+    var result;
+    if (internals.isPreloaded(document, "resources/image1.png") && internals.isPreloaded(document, "resources/script1.js"))
+        result = "PASS";
+    else
+        result = "FAIL";
+    document.getElementsByTagName("body")[0].appendChild(document.createTextNode(result));
 }
+
+window.addEventListener("DOMContentLoaded", checkForPreload, false);
 </script>
 <script src=resources/non-existant.js></script>
 </head>

LayoutTests/http/tests/loading/cross-origin-XHR-willLoadRequest-expected.txt

@@ -2,6 +2,6 @@ main frame - didStartProvisionalLoadForFrame
 main frame - didCommitLoadForFrame
 main frame - didFinishDocumentLoadForFrame
 main frame - didHandleOnloadEventsForFrame
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://localhost:8000/loading/resources/foo.txt. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
 main frame - didFinishLoadForFrame
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://localhost:8000/loading/resources/foo.txt. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
 The console message above should report failure to load foo.txt due to cross-origin access, not a network error.

LayoutTests/http/tests/loading/cross-origin-XHR-willLoadRequest.html

@@ -1,8 +1,13 @@
 <script>
     layoutTestController.dumpAsText();
+    layoutTestController.waitUntilDone();
     layoutTestController.addURLToRedirect("http://localhost:8000/loading/resources/bar.txt", "http://localhost:8000/loading/resources/foo.txt");
 
     var request = new XMLHttpRequest();
+    request.onreadystatechange = function() {
+        if (request.readyState == 4)
+            layoutTestController.notifyDone();
+    }
     request.open("GET", "http://localhost:8000/loading/resources/bar.txt");
     request.send();
 </script>

LayoutTests/http/tests/loading/preload-append-scan-expected.txt

@@ -1,11 +1,9 @@
 main frame - didStartProvisionalLoadForFrame
 main frame - didCommitLoadForFrame
-slow-script.pl has MIME type application/javascript
 main frame - didFinishDocumentLoadForFrame
 main frame - didHandleOnloadEventsForFrame
-preload-test.jpg has MIME type image/jpeg
 main frame - didFinishLoadForFrame
 
 This test needs to be run in DRT. Preload scanner should see the image resource.
 <img src="resources/preload-test.jpg">
-
+PASS

LayoutTests/http/tests/loading/preload-append-scan.php

@@ -5,11 +5,22 @@
 # Spam a bunch of As to make sure we blow past any buffers.
 print str_repeat("A", 2048);
 ?> -->
+<body>
 <script>
-if (window.layoutTestController) {
+if (window.layoutTestController)
     layoutTestController.dumpAsText();
-    layoutTestController.dumpResourceResponseMIMETypes();
+
+function checkForPreload() {
+    var result;
+    if (internals.isPreloaded(document, "resources/preload-test.jpg"))
+        result = "PASS";
+    else
+        result = "FAIL";
+    document.getElementsByTagName("body")[0].appendChild(document.createTextNode(result));
 }
+
+window.addEventListener("DOMContentLoaded", checkForPreload, false);
+
 function debug(x) {}
 </script>
 <script src="http://127.0.0.1:8000/resources/slow-script.pl?delay=1000"></script>

LayoutTests/http/tests/misc/favicon-loads-with-icon-loading-override-expected.txt

@@ -2,8 +2,6 @@
 http://127.0.0.1:8000/misc/favicon-loads-with-icon-loading-override.html - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/misc/favicon-loads-with-icon-loading-override.html, main document URL http://127.0.0.1:8000/misc/favicon-loads-with-icon-loading-override.html, http method GET> redirectResponse (null)
 http://127.0.0.1:8000/misc/favicon-loads-with-icon-loading-override.html - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/misc/favicon-loads-with-icon-loading-override.html, http status code 200>
 http://127.0.0.1:8000/misc/resources/favicon.ico - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/misc/resources/favicon.ico, main document URL http://127.0.0.1:8000/misc/favicon-loads-with-icon-loading-override.html, http method GET> redirectResponse (null)
-http://127.0.0.1:8000/misc/favicon-loads-with-icon-loading-override.html - didFinishLoading
-http://127.0.0.1:8000/misc/resources/favicon.ico - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/misc/resources/favicon.ico, http status code 200>
 https://bugs.webkit.org/show_bug.cgi?id=58292 - Provide new setting to allow site icon loading despite disabling automatic image loading in general.
 Resource load callbacks will reveal if the favicon still gets loaded if automatic image loading is disabled, but site icon image loading override is enabled. 
 

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

@@ -2,6 +2,4 @@
 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/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)
-http://127.0.0.1:8000/misc/link-rel-icon-beforeload.html - didFinishLoading
-http://127.0.0.1:8000/favicon.ico - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/favicon.ico, http status code 200>
 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.

Source/WebCore/ChangeLog

@@ -1,3 +1,29 @@
+2011-06-22  Nate Chapin  <japhet@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Don't let all subresources keep isLoadingInAPISense() from
+        returning false, only requests that affect
+        CachedResourceRequest::requestCount().
+
+        Also, add a callback to Internals to determine whether
+        a resource has been preloaded.
+
+        https://bugs.webkit.org/show_bug.cgi?id=62066
+
+        * WebCore.exp.in:
+        * dom/Document.cpp: Add m_loadEventFinished.
+        * dom/Document.h:
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::isLoadingInAPISense):
+        * loader/cache/CachedResourceLoader.cpp:
+        (WebCore::CachedResourceLoader::isPreloaded):
+        * loader/cache/CachedResourceLoader.h:
+        * testing/Internals.cpp:
+        (WebCore::Internals::isPreloaded):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2011-06-22  Chris Rogers  <crogers@google.com>
 
         Reviewed by David Levin.

Source/WebCore/WebCore.exp.in

@@ -1179,6 +1179,7 @@ __ZNK7WebCore19ResourceRequestBase15httpHeaderFieldEPKc
 __ZNK7WebCore19ResourceRequestBase3urlEv
 __ZNK7WebCore19ResourceRequestBase6isNullEv
 __ZNK7WebCore19ResourceRequestBase7isEmptyEv
+__ZNK7WebCore20CachedResourceLoader11isPreloadedERKN3WTF6StringE
 __ZNK7WebCore20HTMLTableCellElement9cellAboveEv
 __ZNK7WebCore20ResourceResponseBase14httpStatusCodeEv
 __ZNK7WebCore20ResourceResponseBase14httpStatusTextEv

Source/WebCore/dom/Document.cpp

@@ -387,6 +387,7 @@ Document::Document(Frame* frame, const KURL& url, bool isXHTML, bool isHTML)
     , m_ignoreDestructiveWriteCount(0)
     , m_titleSetExplicitly(false)
     , m_updateFocusAppearanceTimer(this, &Document::updateFocusAppearanceTimerFired)
+    , m_loadEventFinished(false)
     , m_startTime(currentTime())
     , m_overMinimumLayoutThreshold(false)
     , m_extraLayoutDelay(0)
@@ -3400,6 +3401,7 @@ void Document::dispatchWindowLoadEvent()
     if (!domWindow)
         return;
     domWindow->dispatchLoadEvent();
+    m_loadEventFinished = true;
 }
 
 void Document::enqueueWindowEvent(PassRefPtr<Event> event)

Source/WebCore/dom/Document.h

@@ -997,6 +997,7 @@ class Document : public TreeScope, public ScriptExecutionContext {
     void statePopped(SerializedScriptValue*);
 
     bool processingLoadEvent() const { return m_processingLoadEvent; }
+    bool loadEventFinished() const { return m_loadEventFinished; }
 
 #if ENABLE(DATABASE)
     virtual bool allowDatabaseAccess() const;
@@ -1278,8 +1279,12 @@ class Document : public TreeScope, public ScriptExecutionContext {
     Timer<Document> m_updateFocusAppearanceTimer;
 
     Element* m_cssTarget;
-
+
+    // FIXME: Merge these 2 variables into an enum. Also, FrameLoader::m_didCallImplicitClose
+    // is almost a duplication of this data, so that should probably get merged in too.
     bool m_processingLoadEvent;
+    bool m_loadEventFinished;
+
     RefPtr<SerializedScriptValue> m_pendingStateObject;
     double m_startTime;
     bool m_overMinimumLayoutThreshold;

Source/WebCore/loader/DocumentLoader.cpp

@@ -441,11 +441,9 @@ bool DocumentLoader::isLoadingInAPISense() const
     // Once a frame has loaded, we no longer need to consider subresources,
     // but we still need to consider subframes.
     if (frameLoader()->state() != FrameStateComplete) {
-        if (!m_primaryLoadComplete && isLoading())
-            return true;
-        if (!m_subresourceLoaders.isEmpty())
-            return true;
         Document* doc = m_frame->document();
+        if ((!m_primaryLoadComplete || !m_frame->document()->loadEventFinished()) && isLoading())
+            return true;
         if (doc->cachedResourceLoader()->requestCount())
             return true;
         if (DocumentParser* parser = doc->parser())

Source/WebCore/loader/cache/CachedResourceLoader.cpp

@@ -652,6 +652,28 @@ void CachedResourceLoader::requestPreload(CachedResource::Type type, ResourceReq
 #endif
 }
 
+bool CachedResourceLoader::isPreloaded(const String& urlString) const
+{
+    const KURL& url = m_document->completeURL(urlString);
+
+    if (m_preloads) {
+        ListHashSet<CachedResource*>::iterator end = m_preloads->end();
+        for (ListHashSet<CachedResource*>::iterator it = m_preloads->begin(); it != end; ++it) {
+            CachedResource* resource = *it;
+            if (resource->url() == url)
+                return true;
+        }
+    }
+
+    Deque<PendingPreload>::const_iterator dequeEnd = m_pendingPreloads.end();
+    for (Deque<PendingPreload>::const_iterator it = m_pendingPreloads.begin(); it != dequeEnd; ++it) {
+        PendingPreload pendingPreload = *it;
+        if (pendingPreload.m_request.url() == url)
+            return true;
+    }
+    return false;
+}
+
 void CachedResourceLoader::clearPreloads()
 {
 #if PRELOAD_DEBUG

Source/WebCore/loader/cache/CachedResourceLoader.h

@@ -96,7 +96,8 @@ friend class ResourceCacheValidationSuppressor;
     void incrementRequestCount(const CachedResource*);
     void decrementRequestCount(const CachedResource*);
     int requestCount();
-
+
+    bool isPreloaded(const String& urlString) const;
     void clearPreloads();
     void clearPendingPreloads();
     void preload(CachedResource::Type, ResourceRequest&, const String& charset, bool referencedFromBody);

Source/WebCore/testing/Internals.cpp

@@ -26,6 +26,8 @@
 #include "config.h"
 #include "Internals.h"
 
+#include "CachedResourceLoader.h"
+#include "Document.h"
 #include "RenderTreeAsText.h"
 #include "ShadowContentElement.h"
 
@@ -44,6 +46,14 @@ Internals::Internals()
 {
 }
 
+bool Internals::isPreloaded(Document* document, const String& url)
+{
+    if (!document)
+        return false;
+
+    return document->cachedResourceLoader()->isPreloaded(url);
+}
+
 PassRefPtr<Element> Internals::createShadowContentElement(Document* document, ExceptionCode& ec)
 {
     if (!document) {

Source/WebCore/testing/Internals.h

@@ -27,6 +27,7 @@
 #define Internals_h
 
 #include "ExceptionCode.h"
+#include "PlatformString.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 #include <wtf/text/WTFString.h>
@@ -40,6 +41,8 @@ class Internals : public RefCounted<Internals> {
 public:
     static PassRefPtr<Internals> create();
     virtual ~Internals();
+
+    bool isPreloaded(Document*, const String& url);
 
     PassRefPtr<Element> createShadowContentElement(Document*, ExceptionCode&);
     String elementRenderTreeAsText(Element*, ExceptionCode&);

Source/WebCore/testing/Internals.idl

@@ -29,6 +29,7 @@ module window {
     ] Internals {
         Element createShadowContentElement(in Document document) raises(DOMException);
         DOMString elementRenderTreeAsText(in Element element) raises(DOMException);
+        boolean isPreloaded(in Document document, in DOMString url);
     };
 }
 

Source/WebKit2/ChangeLog

@@ -1,3 +1,12 @@
+2011-06-22  Nate Chapin  <japhet@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Add win symbols for new window.internals functionality.
+        https://bugs.webkit.org/show_bug.cgi?id=62066
+
+        * win/WebKit2.def:
+
 2011-06-22  Balazs Kelemen  <kbalazs@webkit.org>
 
         Reviewed by Andreas Kling.

Source/WebKit2/win/WebKit2.def

@@ -136,6 +136,7 @@ EXPORTS
 
         ; Re-exports from WebCore for WebCoreTestSupport
         ?getCachedDOMStructure@WebCore@@YAPAVStructure@JSC@@PAVJSDOMGlobalObject@1@PBUClassInfo@3@@Z
+        ?isPreloaded@CachedResourceLoader@WebCore@@QBE_NABVString@WTF@@@Z
         ?cacheDOMStructure@WebCore@@YAPAVStructure@JSC@@PAVJSDOMGlobalObject@1@PAV23@PBUClassInfo@3@@Z
         ?virtualFunctionToPreventWeakVtable@JSDOMWrapper@WebCore@@MAEXXZ
         ?create@ShadowContentElement@WebCore@@SA?AV?$PassRefPtr@VShadowContentElement@WebCore@@@WTF@@PAVDocument@2@@Z

Source/autotools/symbols.filter

@@ -45,6 +45,7 @@ _ZN7WebCore6JSNode6s_infoE;
 _ZN7WebCore9JSElement3putEPN3JSC9ExecStateERKNS1_10IdentifierENS1_7JSValueERNS1_15PutPropertySlotE;
 _ZN7WebCore9JSElement6s_infoE;
 _ZN7WebCore9toElementEN3JSC7JSValueE;
+_ZNK7WebCore20CachedResourceLoader11isPreloadedERKN3WTF6StringE;
 _ZNK7WebCore6JSNode21pushEventHandlerScopeEPN3JSC9ExecStateEPNS1_14ScopeChainNodeE;
 local:
 _Z*;