[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[loislo at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 9de6e6ddf93d41b3f3ed8a663eb21cc2380a9ade
Author: loislo at chromium.org <loislo at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 31 11:41:52 2010 +0000

    2010-12-31  Ilya Tikhonovsky  <loislo at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Web Inspector: [Chromium] Inspector's tests are very slow on Win(Dbg).
    
            It was a problem with Chromium DRT. DevToolsAgent object instance was
            attached not only to the inspected page but to the DevTools window too.
            As result all the inspector files were interpreted as a content of inspected page
            and were transfered to the DevTools scripts panel for debugging etc.
    
            https://bugs.webkit.org/show_bug.cgi?id=51735
    
            * DumpRenderTree/chromium/TestShell.cpp:
            (TestShell::TestShell):
            (TestShell::bindJSObjectsToWindow):
            (TestShell::createNewWindow):
            * DumpRenderTree/chromium/TestShell.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74826 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 4a7bae5..baaa9e3 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,22 @@
+2010-12-31  Ilya Tikhonovsky  <loislo at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: [Chromium] Inspector's tests are very slow on Win(Dbg).
+
+        It was a problem with Chromium DRT. DevToolsAgent object instance was
+        attached not only to the inspected page but to the DevTools window too.
+        As result all the inspector files were interpreted as a content of inspected page
+        and were transfered to the DevTools scripts panel for debugging etc.
+
+        https://bugs.webkit.org/show_bug.cgi?id=51735
+
+        * DumpRenderTree/chromium/TestShell.cpp:
+        (TestShell::TestShell):
+        (TestShell::bindJSObjectsToWindow):
+        (TestShell::createNewWindow):
+        * DumpRenderTree/chromium/TestShell.h:
+
 2010-12-31  Adam Barth  <abarth at webkit.org>
 
         Rubber-stamped by Eric Seidel.
diff --git a/Tools/DumpRenderTree/chromium/TestShell.cpp b/Tools/DumpRenderTree/chromium/TestShell.cpp
index 21f4208..d5f2b5c 100644
--- a/Tools/DumpRenderTree/chromium/TestShell.cpp
+++ b/Tools/DumpRenderTree/chromium/TestShell.cpp
@@ -106,8 +106,13 @@ TestShell::TestShell(bool testShellMode)
     // timed-out DRT process was crashed.
     m_timeout = 30 * 1000;
 
+    createMainWindow();
+}
+
+void TestShell::createMainWindow()
+{
     m_drtDevToolsAgent.set(new DRTDevToolsAgent);
-    m_webViewHost = createWebView();
+    m_webViewHost = createNewWindow(WebURL(), m_drtDevToolsAgent.get());
     m_webView = m_webViewHost->webView();
     m_drtDevToolsAgent->setWebView(m_webView);
 }
@@ -557,15 +562,15 @@ void TestShell::bindJSObjectsToWindow(WebFrame* frame)
     m_textInputController->bindToJavascript(frame, WebString::fromUTF8("textInputController"));
 }
 
-WebViewHost* TestShell::createWebView()
+WebViewHost* TestShell::createNewWindow(const WebKit::WebURL& url)
 {
-    return createNewWindow(WebURL());
+    return createNewWindow(url, 0);
 }
 
-WebViewHost* TestShell::createNewWindow(const WebURL& url)
+WebViewHost* TestShell::createNewWindow(const WebKit::WebURL& url, DRTDevToolsAgent* devToolsAgent)
 {
     WebViewHost* host = new WebViewHost(this);
-    WebView* view = WebView::create(host, m_drtDevToolsAgent.get());
+    WebView* view = WebView::create(host, devToolsAgent);
     host->setWebWidget(view);
     m_prefs.applyTo(view);
     view->initializeMainFrame(host);
diff --git a/Tools/DumpRenderTree/chromium/TestShell.h b/Tools/DumpRenderTree/chromium/TestShell.h
index 1da4e17..8a1cbac 100644
--- a/Tools/DumpRenderTree/chromium/TestShell.h
+++ b/Tools/DumpRenderTree/chromium/TestShell.h
@@ -151,7 +151,6 @@ public:
     // testing where we only want to have the output from the last load.
     void setDumpWhenFinished(bool dumpWhenFinished) { m_dumpWhenFinished = dumpWhenFinished; }
 
-    WebViewHost* createWebView();
     WebViewHost* createNewWindow(const WebKit::WebURL&);
     void closeWindow(WebViewHost*);
     void closeRemainingWindows();
@@ -168,6 +167,8 @@ public:
     static const int virtualWindowBorder = 3;
 
 private:
+    WebViewHost* createNewWindow(const WebKit::WebURL&, DRTDevToolsAgent* devToolsAgent);
+    void createMainWindow();
     void createDRTDevToolsClient(DRTDevToolsAgent*);
 
     void resetWebSettings(WebKit::WebView&);
diff --git a/Tools/DumpRenderTree/chromium/WebViewHost.cpp b/Tools/DumpRenderTree/chromium/WebViewHost.cpp
index d880879..f272b58 100644
--- a/Tools/DumpRenderTree/chromium/WebViewHost.cpp
+++ b/Tools/DumpRenderTree/chromium/WebViewHost.cpp
@@ -235,7 +235,7 @@ WebView* WebViewHost::createView(WebFrame*, const WebWindowFeatures&, const WebS
 {
     if (!layoutTestController()->canOpenWindows())
         return 0;
-    return m_shell->createWebView()->webView();
+    return m_shell->createNewWindow(WebURL())->webView();
 }
 
 WebWidget* WebViewHost::createPopupMenu(WebPopupType)

-- 
WebKit Debian packaging