Changeset 124567 in webkit

Timestamp:

Aug 3, 2012 12:28:41 AM (12 years ago)

Author:

kbalazs@webkit.org

Message:

WTR should be able to load external resources
​https://bugs.webkit.org/show_bug.cgi?id=89382

Reviewed by Ryosuke Niwa.

Allow to load an external resource as the main frame
and allow all subsequent external loads for such a main
frame. This behavior is necessary for being able to run
performance tests (wkb.ug/84008).

• WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:

(WTR::isLocalHost):
(WTR):
(WTR::isHTTPOrHTTPSScheme):
(WTR::InjectedBundlePage::willSendRequestForFrame):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-08-03  Balazs Kelemen  <kbalazs@webkit.org>
+
+        WTR should be able to load external resources
+        https://bugs.webkit.org/show_bug.cgi?id=89382
+
+        Reviewed by Ryosuke Niwa.
+
+        Allow to load an external resource as the main frame
+        and allow all subsequent external loads for such a main
+        frame. This behavior is necessary for being able to run
+        performance tests (wkb.ug/84008).
+
+        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+        (WTR::isLocalHost):
+        (WTR):
+        (WTR::isHTTPOrHTTPSScheme):
+        (WTR::InjectedBundlePage::willSendRequestForFrame):
+
 2012-08-02  Joone Hur  <joone.hur@intel.com>
 

trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp

@@ -945 +945 @@
 // Resource Load Client Callbacks
 
-WKURLRequestRef InjectedBundlePage::willSendRequestForFrame(WKBundlePageRef, WKBundleFrameRef, uint64_t, WKURLRequestRef request, WKURLResponseRef)
+static inline bool isLocalHost(WKStringRef host)
+{
+    return WKStringIsEqualToUTF8CString(host, "127.0.0.1") || WKStringIsEqualToUTF8CString(host, "localhost");
+}
+
+static inline bool isHTTPOrHTTPSScheme(WKStringRef scheme)
+{
+    return WKStringIsEqualToUTF8CStringIgnoringCase(scheme, "http") || WKStringIsEqualToUTF8CStringIgnoringCase(scheme, "https");
+}
+
+WKURLRequestRef InjectedBundlePage::willSendRequestForFrame(WKBundlePageRef, WKBundleFrameRef frame, uint64_t, WKURLRequestRef request, WKURLResponseRef)
 {
     if (InjectedBundle::shared().isTestRunning() && InjectedBundle::shared().layoutTestController()->willSendRequestReturnsNull())
@@ -955 +965 @@
     WKRetainPtr<WKStringRef> urlString = adoptWK(WKURLCopyString(url.get()));
     if (host && !WKStringIsEmpty(host.get())
-        && (WKStringIsEqualToUTF8CStringIgnoringCase(scheme.get(), "http") || WKStringIsEqualToUTF8CStringIgnoringCase(scheme.get(), "https"))
-        && !WKStringIsEqualToUTF8CString(host.get(), "127.0.0.1")
+        && isHTTPOrHTTPSScheme(scheme.get())
         && !WKStringIsEqualToUTF8CString(host.get(), "255.255.255.255") // Used in some tests that expect to get back an error.
-        && !WKStringIsEqualToUTF8CStringIgnoringCase(host.get(), "localhost")) {
-        InjectedBundle::shared().stringBuilder()->append("Blocked access to external URL ");
-        InjectedBundle::shared().stringBuilder()->append(toWTFString(urlString));
-        InjectedBundle::shared().stringBuilder()->append("\n");
-        return 0;
+        && !isLocalHost(host.get())) {
+        WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(m_page);
+        if (mainFrame != frame) {
+            WKRetainPtr<WKURLRef> mainFrameURL = adoptWK(WKBundleFrameCopyURL(mainFrame));
+            WKRetainPtr<WKStringRef> mainFrameHost = WKURLCopyHostName(mainFrameURL.get());
+            WKRetainPtr<WKStringRef> mainFrameScheme = WKURLCopyScheme(mainFrameURL.get());
+
+            bool mainFrameIsExternal = isHTTPOrHTTPSScheme(mainFrameScheme.get()) && !isLocalHost(mainFrameHost.get());
+            if (!mainFrameIsExternal) {
+                InjectedBundle::shared().stringBuilder()->append("Blocked access to external URL ");
+                InjectedBundle::shared().stringBuilder()->append(toWTFString(urlString));
+                InjectedBundle::shared().stringBuilder()->append("\n");
+                return 0;
+            }
+        }
     }