Changeset 143480 in webkit

Timestamp:

Feb 20, 2013, 10:45:45 AM (12 years ago)

Author:

jochen@chromium.org

Message:

[chromium] use a WebTestProxyBase pointer to identify the window we need the history for
​https://bugs.webkit.org/show_bug.cgi?id=110346

Reviewed by Adam Barth.

Using an index is very brittle, as the TestRunner API does not define
any ordering of windows.

Also, make TestRunner::shouldDumpBackForwardList() so content shell can
trigger the capturing in the browser process before generating the
text dump.

• DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h:

(WebTestRunner):
(WebTestRunner::WebTestDelegate::captureHistoryForWindow):

• DumpRenderTree/chromium/TestRunner/public/WebTestRunner.h:

(WebTestRunner):

• DumpRenderTree/chromium/TestRunner/src/TestRunner.h:

(TestRunner):

• DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp:

(WebTestRunner::WebTestProxyBase::captureTree):

• DumpRenderTree/chromium/WebViewHost.cpp:

(WebViewHost::captureHistoryForWindow):

• DumpRenderTree/chromium/WebViewHost.h:

(WebViewHost):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h (modified) (3 diffs)
• DumpRenderTree/chromium/TestRunner/public/WebTestRunner.h (modified) (1 diff)
• DumpRenderTree/chromium/TestRunner/src/TestRunner.h (modified) (2 diffs)
• DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp (modified) (2 diffs)
• DumpRenderTree/chromium/WebViewHost.cpp (modified) (1 diff)
• DumpRenderTree/chromium/WebViewHost.h (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-02-20  Jochen Eisinger  <jochen@chromium.org>
+
+        [chromium] use a WebTestProxyBase pointer to identify the window we need the history for
+        https://bugs.webkit.org/show_bug.cgi?id=110346
+
+        Reviewed by Adam Barth.
+
+        Using an index is very brittle, as the TestRunner API does not define
+        any ordering of windows.
+
+        Also, make TestRunner::shouldDumpBackForwardList() so content shell can
+        trigger the capturing in the browser process before generating the
+        text dump.
+
+        * DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h:
+        (WebTestRunner):
+        (WebTestRunner::WebTestDelegate::captureHistoryForWindow):
+        * DumpRenderTree/chromium/TestRunner/public/WebTestRunner.h:
+        (WebTestRunner):
+        * DumpRenderTree/chromium/TestRunner/src/TestRunner.h:
+        (TestRunner):
+        * DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp:
+        (WebTestRunner::WebTestProxyBase::captureTree):
+        * DumpRenderTree/chromium/WebViewHost.cpp:
+        (WebViewHost::captureHistoryForWindow):
+        * DumpRenderTree/chromium/WebViewHost.h:
+        (WebViewHost):
+
 2013-02-19  Rouslan Solomakhin  <rouslan@chromium.org>
 

trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h

@@ -37 +37 @@
 #include <string>
 
+#define WEBTESTRUNNER_NEW_HISTORY_CAPTURE
+
 namespace WebKit {
 class WebGamepads;
@@ -48 +50 @@
 struct WebPreferences;
 class WebTask;
+class WebTestProxyBase;
 
 class WebTestDelegate {
@@ -94 +97 @@
     virtual void loadURLForFrame(const WebKit::WebURL&, const std::string&) { }
     virtual bool allowExternalPages() { return false; }
-    virtual void captureHistoryForWindow(size_t windowIndex, WebKit::WebVector<WebKit::WebHistoryItem>* history, size_t* currentEntryIndex) { }
+    virtual void captureHistoryForWindow(WebTestProxyBase*, WebKit::WebVector<WebKit::WebHistoryItem>* history, size_t* currentEntryIndex) { }
 };
 

trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestRunner.h

@@ -44 +44 @@
     virtual bool shouldDumpAsAudio() const = 0;
     virtual const WebKit::WebArrayBufferView* audioData() const = 0;
+    virtual bool shouldDumpBackForwardList() const = 0;
     virtual WebKit::WebPermissionClient* webPermissions() const = 0;
 };

trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h

@@ -79 +79 @@
     virtual bool shouldDumpAsAudio() const OVERRIDE;
     virtual const WebKit::WebArrayBufferView* audioData() const OVERRIDE;
+    virtual bool shouldDumpBackForwardList() const OVERRIDE;
     virtual WebKit::WebPermissionClient* webPermissions() const OVERRIDE;
 
@@ -87 +88 @@
     bool isPrinting() const;
     bool shouldDumpAsText();
-    bool shouldDumpBackForwardList() const;
     bool shouldDumpChildFrameScrollPositions() const;
     bool shouldDumpChildFramesAsText() const;

trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp

@@ -401 +401 @@
 }
 
-string dumpAllBackForwardLists(WebTestDelegate* delegate, unsigned windowCount)
+string dumpAllBackForwardLists(TestInterfaces* interfaces, WebTestDelegate* delegate)
 {
     string result;
-    for (unsigned i = 0; i < windowCount; ++i) {
+    const vector<WebTestProxyBase*>& windowList = interfaces->windowList();
+    for (unsigned i = 0; i < windowList.size(); ++i) {
         size_t currentEntryIndex = 0;
         WebVector<WebHistoryItem> history;
-        delegate->captureHistoryForWindow(i, &history, &currentEntryIndex);
+        delegate->captureHistoryForWindow(windowList.at(i), &history, &currentEntryIndex);
         dumpBackForwardList(history, currentEntryIndex, result);
     }
@@ -489 +490 @@
 
     if (m_testInterfaces->testRunner()->shouldDumpBackForwardList())
-        dataUtf8 += dumpAllBackForwardLists(m_delegate, m_testInterfaces->windowList().size());
+        dataUtf8 += dumpAllBackForwardLists(m_testInterfaces, m_delegate);
 
     return dataUtf8;

trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp

@@ -714 +714 @@
 }
 
-void WebViewHost::captureHistoryForWindow(size_t windowIndex, WebVector<WebHistoryItem>* history, size_t* currentEntryIndex)
-{
-    m_shell->captureHistoryForWindow(windowIndex, history, currentEntryIndex);
+void WebViewHost::captureHistoryForWindow(WebTestProxyBase* proxy, WebVector<WebHistoryItem>* history, size_t* currentEntryIndex)
+{
+    for (size_t i = 0; i < m_shell->windowList().size(); ++i) {
+        if (m_shell->windowList()[i]->proxy() == proxy)
+            m_shell->captureHistoryForWindow(i, history, currentEntryIndex);
+    }
 }
 

trunk/Tools/DumpRenderTree/chromium/WebViewHost.h

@@ -120 +120 @@
     virtual void loadURLForFrame(const WebKit::WebURL&, const std::string& frameName) OVERRIDE;
     virtual bool allowExternalPages() OVERRIDE;
-    virtual void captureHistoryForWindow(size_t windowIndex, WebKit::WebVector<WebKit::WebHistoryItem>*, size_t* currentEntryIndex) OVERRIDE;
+    virtual void captureHistoryForWindow(WebTestRunner::WebTestProxyBase*, WebKit::WebVector<WebKit::WebHistoryItem>*, size_t* currentEntryIndex) OVERRIDE;
 
     // NavigationHost