2011-06-22 Nate Chapin <japhet@chromium.org>
authorjaphet@chromium.org <japhet@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 23 Jun 2011 00:28:56 +0000 (00:28 +0000)
committerjaphet@chromium.org <japhet@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 23 Jun 2011 00:28:56 +0000 (00:28 +0000)
        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:

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

28 files changed:
ChangeLog
LayoutTests/ChangeLog
LayoutTests/fast/preloader/scan-body-from-head-import-expected.txt
LayoutTests/fast/preloader/scan-body-from-head-import.html
LayoutTests/fast/preloader/scan-body-from-head-script-expected.txt
LayoutTests/fast/preloader/scan-body-from-head-script.html
LayoutTests/http/tests/loading/cross-origin-XHR-willLoadRequest-expected.txt
LayoutTests/http/tests/loading/cross-origin-XHR-willLoadRequest.html
LayoutTests/http/tests/loading/preload-append-scan-expected.txt
LayoutTests/http/tests/loading/preload-append-scan.php
LayoutTests/http/tests/misc/favicon-loads-with-icon-loading-override-expected.txt
LayoutTests/http/tests/misc/link-rel-icon-beforeload-expected.txt
LayoutTests/platform/chromium-linux/fast/preloader/scan-body-from-head-script-expected.txt [deleted file]
Source/WebCore/ChangeLog
Source/WebCore/WebCore.exp.in
Source/WebCore/dom/Document.cpp
Source/WebCore/dom/Document.h
Source/WebCore/loader/DocumentLoader.cpp
Source/WebCore/loader/cache/CachedResourceLoader.cpp
Source/WebCore/loader/cache/CachedResourceLoader.h
Source/WebCore/testing/Internals.cpp
Source/WebCore/testing/Internals.h
Source/WebCore/testing/Internals.idl
Source/WebKit2/ChangeLog
Source/WebKit2/win/WebKit2.def
Source/autotools/symbols.filter
Tools/ChangeLog
Tools/GNUmakefile.am

index 6597800ea72efd0fd4ca3c953da1114ea059c520..504a542739a345791479fd2f4db0a1cea7bf198f 100644 (file)
--- a/ChangeLog
+++ b/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.
index b09d4ba3cd053a9f8ec62c2f34b2caea43103da9..e162a64cec12bd9adf65c012f97ee7e41f2170dc 100644 (file)
@@ -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
index bc535df5bb6c69493f8ae8dc711cfbec44197bb2..4bd43ec50069a258d36ca2e8d527f97dbcd8793f 100644 (file)
@@ -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
index 3b2e6e3ae5f623a74cf88106b20d29e2fc9d26bb..55f88cec6a52258abb039699f85981ca851a949a 100644 (file)
@@ -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>
index d17b9fd3080a93372d80ce1855fce5f050ec40d7..f0e94e66f67adaafe705fd90db1f10c00e8b8d62 100644 (file)
@@ -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
index 4e4dbe23a167b0e0c05fae6ca3f4dea8a43917b5..d6eb1471c26442bdfd0ff78e31c723833f52dabf 100644 (file)
@@ -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>
index 2397283112f56926f03a9889c49e72a68b0293bf..f78c597380faa6207e989874509060c2ce406554 100644 (file)
@@ -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.
index ff2e8c00c04d32e3731e0067593d73eee6409669..7dd5e9815b4ec691ec980c1e6a1a2b3782ff5ba9 100644 (file)
@@ -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>
index e790adff4070204f02ceb93f044271ad4061fe3d..b19870ccd0c56fada3e429da0f0929f3f4f72567 100644 (file)
@@ -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
index 3f25443876fff4c8be31972b35d2d34eb6452617..283620f9dc36d36c3483237a860558c05a1f62fa 100644 (file)
@@ -5,11 +5,22 @@ header("Content-Type: text/html; charset=utf-8");
 # 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>
index ce79cbb89fd7d31bce9847e7a908b62dbb284f10..0a9fece265ee151d3b3e801a459727d94a0aa64a 100644 (file)
@@ -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. 
 
index 2c7d533ef5cd9a96b3c47872787e73d0d3e0acf5..9f3ee65293bfea00d4344b4dcbc3c7f9b51ec50a 100644 (file)
@@ -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.
diff --git a/LayoutTests/platform/chromium-linux/fast/preloader/scan-body-from-head-script-expected.txt b/LayoutTests/platform/chromium-linux/fast/preloader/scan-body-from-head-script-expected.txt
deleted file mode 100644 (file)
index 3f75814..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-script1.js has MIME type application/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
-resources are loaded.
-<img src=resources/image1.png>
-<script src=resources/script1.js></script>
-</body>
-</html>
-
index fa156fa770d590b267198b0463877582b321e0b1..d58cdcd3a70a985fc3943d586677717a44347c41 100644 (file)
@@ -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.
index a2fee49df19f930d5618f92543f4559cb1267e33..81bf16747ae8a0aa11546dbc37d45e9d98d2bace 100644 (file)
@@ -1179,6 +1179,7 @@ __ZNK7WebCore19ResourceRequestBase15httpHeaderFieldEPKc
 __ZNK7WebCore19ResourceRequestBase3urlEv
 __ZNK7WebCore19ResourceRequestBase6isNullEv
 __ZNK7WebCore19ResourceRequestBase7isEmptyEv
+__ZNK7WebCore20CachedResourceLoader11isPreloadedERKN3WTF6StringE
 __ZNK7WebCore20HTMLTableCellElement9cellAboveEv
 __ZNK7WebCore20ResourceResponseBase14httpStatusCodeEv
 __ZNK7WebCore20ResourceResponseBase14httpStatusTextEv
index 10d3bab977481b036ecb761c279ef8dd759eb09e..79e0b4cac91b4c99ce61f82fc59addc33c05dfc4 100644 (file)
@@ -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)
index 6e5003780ffacdc9f8c890119b1965a84db48dc7..d3b10039af57b934c6eb1b6993d844a13f52c89d 100644 (file)
@@ -997,6 +997,7 @@ public:
     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 @@ private:
     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;
index 8b8f326d9e2c61addf6019f745c71ff143d48b13..1fcdaf3c7fd3ba48592c07079f30cd1e07216689 100644 (file)
@@ -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())
index b7252c2435d0d589cb70433020e4e61f629a9674..deda239d8c00a7addea71eae2cf3218527552e31 100644 (file)
@@ -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
index 0462ef875a988af0d0274b6d9f78012a1fd2f26e..1498480ffc7e85bbc03d922b4f8a5855b601aa0c 100644 (file)
@@ -96,7 +96,8 @@ public:
     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);
index d385f15025fceaababf72687a7d3ac8c172671c1..03bdbeafd9d0e6c4d5c94a4f0f7abf20d7d1746e 100644 (file)
@@ -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) {
index e6d61cb68978ec042fa949decc1a484653661147..358b5d57a93acd6e87d0188b62d75d57d6a66463 100644 (file)
@@ -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&);
index 8bc712b3d1575ecf9091cc1a06648a0ab02dd378..369277e35a72d7cf5d3e46bf03ace997404328a3 100644 (file)
@@ -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);
     };
 }
 
index 34e3b2d0e22c7c7ecdd1900e9b689d73a6be01be..88413c86b979453048bfd0a42f5e89f1ed6901b2 100644 (file)
@@ -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.
index fbec95fe8b6593b9a18f070443300cb65ee903c4..670bf8ee5150d6bd194b6fb51d86ffbc081109e6 100644 (file)
@@ -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
index 15eb45b720ee0fe5ef446621a22e5918e4b94329..9820648f2df500074156ec5aaf5f85cf83d86648 100644 (file)
@@ -45,6 +45,7 @@ _ZN7WebCore6JSNode6s_infoE;
 _ZN7WebCore9JSElement3putEPN3JSC9ExecStateERKNS1_10IdentifierENS1_7JSValueERNS1_15PutPropertySlotE;
 _ZN7WebCore9JSElement6s_infoE;
 _ZN7WebCore9toElementEN3JSC7JSValueE;
+_ZNK7WebCore20CachedResourceLoader11isPreloadedERKN3WTF6StringE;
 _ZNK7WebCore6JSNode21pushEventHandlerScopeEPN3JSC9ExecStateEPNS1_14ScopeChainNodeE;
 local:
 _Z*;
index 2200cfbb1b6a341947545e4ad6bbb47e786f0461..d1bfb386b8a25f99f6851c374ae55ed2050fe45e 100644 (file)
@@ -1,3 +1,12 @@
+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:
+
 2011-06-22  Dirk Pranke  <dpranke@chromium.org>
 
         Reviewed by Tony Chang.
index c68b6ee00f5e8eb9552f7c524430bfa435fe88e1..bfc0b50f558473091b39bff176d0f97ee31623d1 100644 (file)
@@ -111,7 +111,8 @@ libWebCoreInternals_la_CXXFLAGS = \
 
 libWebCoreInternals_la_CFLAGS = \
        -fno-strict-aliasing \
-       $(javascriptcore_cflags)
+       $(javascriptcore_cflags) \
+        $(LIBSOUP_CFLAGS)
 
 # DumpRenderTree
 Programs_DumpRenderTree_CPPFLAGS = \