Changeset 61527 in webkit

Timestamp:

Jun 20, 2010 9:38:51 PM (14 years ago)

Author:

tkent@chromium.org

Message:

2010-06-20 Kent Tamura <​tkent@chromium.org>

Reviewed by Dimitri Glazkov.

[DRT/Chromium] Add --allow-external-pages option
​https://bugs.webkit.org/show_bug.cgi?id=40762

Add --allow-external-pages introduced by Chromium r45403.
​http://src.chromium.org/viewvc/chrome?view=rev&revision=45403

• DumpRenderTree/chromium/DumpRenderTree.cpp: (main):
• DumpRenderTree/chromium/TestShell.cpp: (TestShell::TestShell):
• DumpRenderTree/chromium/TestShell.h: (TestShell::allowExternalPages): (TestShell::setAllowExternalPages):
• DumpRenderTree/chromium/WebViewHost.cpp: (WebViewHost::willSendRequest):

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/chromium/DumpRenderTree.cpp (modified) (4 diffs)
• DumpRenderTree/chromium/TestShell.cpp (modified) (1 diff)
• DumpRenderTree/chromium/TestShell.h (modified) (2 diffs)
• DumpRenderTree/chromium/WebViewHost.cpp (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-06-20  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        [DRT/Chromium] Add --allow-external-pages option
+        https://bugs.webkit.org/show_bug.cgi?id=40762
+
+        Add --allow-external-pages introduced by Chromium r45403.
+        http://src.chromium.org/viewvc/chrome?view=rev&revision=45403
+
+        * DumpRenderTree/chromium/DumpRenderTree.cpp:
+        (main):
+        * DumpRenderTree/chromium/TestShell.cpp:
+        (TestShell::TestShell):
+        * DumpRenderTree/chromium/TestShell.h:
+        (TestShell::allowExternalPages):
+        (TestShell::setAllowExternalPages):
+        * DumpRenderTree/chromium/WebViewHost.cpp:
+        (WebViewHost::willSendRequest):
+
 2010-06-20  Joseph Pecoraro  <joepeck@webkit.org>
 

trunk/WebKitTools/DumpRenderTree/chromium/DumpRenderTree.cpp

@@ -48 +48 @@
 static const char optionPixelTestsWithName[] = "--pixel-tests=";
 static const char optionTestShell[] = "--test-shell";
+static const char optionAllowExternalPages[] = "--allow-external-pages";
 
 static void runTest(TestShell& shell, TestParams& params, const string& testName, bool testShellMode)
@@ -90 +91 @@
     bool serverMode = false;
     bool testShellMode = false;
+    bool allowExternalPages = false;
     for (int i = 1; i < argc; ++i) {
         string argument(argv[i]);
@@ -104 +106 @@
             testShellMode = true;
             serverMode = true;
-        } else if (argument.size() && argument[0] == '-')
+        } else if (argument == optionAllowExternalPages)
+            allowExternalPages = true;
+        else if (argument.size() && argument[0] == '-')
             fprintf(stderr, "Unknown option: %s\n", argv[i]);
         else
@@ -116 +120 @@
     { // Explicit scope for the TestShell instance.
         TestShell shell(testShellMode);
+        shell.setAllowExternalPages(allowExternalPages);
         if (serverMode && !tests.size()) {
             params.printSeparators = true;

trunk/WebKitTools/DumpRenderTree/chromium/TestShell.cpp

@@ -81 +81 @@
     , m_focusedWidget(0)
     , m_testShellMode(testShellMode)
+    , m_allowExternalPages(false)
 {
     WebRuntimeFeatures::enableGeolocation(true);

trunk/WebKitTools/DumpRenderTree/chromium/TestShell.h

@@ -108 +108 @@
     void testTimedOut();
 
+    bool allowExternalPages() const { return m_allowExternalPages; }
+    void setAllowExternalPages(bool allowExternalPages) { m_allowExternalPages = allowExternalPages; }
+
 #if defined(OS_WIN)
     // Access to the finished event.  Used by the static WatchDog thread.
@@ -150 +153 @@
     TestParams m_params;
     int m_timeout; // timeout value in millisecond
+    bool m_allowExternalPages;
 
     // List of all windows in this process.

trunk/WebKitTools/DumpRenderTree/chromium/WebViewHost.cpp

@@ -919 +919 @@
         && host != "127.0.0.1"
         && host != "255.255.255.255"
-        && host != "localhost") {
+        && host != "localhost"
+        && !m_shell->allowExternalPages()) {
         printf("Blocked access to external URL %s\n", requestURL.c_str());