[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[kenneth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 38272b5e26ae53083d6518149d8464858c283f19
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 18 16:38:37 2009 +0000

    Change the initialization order so that the controllers
    will be created before exporting them to the JS DOM window.
    
    Reviewed by Simon Hausmann.
    
    * DumpRenderTree/qt/DumpRenderTree.cpp:
    (WebCore::DumpRenderTree::DumpRenderTree):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51114 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 0b21f49..8012c33 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,16 @@
 
         Reviewed by Simon Hausmann.
 
+        Change the initialization order so that the controllers
+        will be created before exporting them to the JS DOM window.
+
+        * DumpRenderTree/qt/DumpRenderTree.cpp:
+        (WebCore::DumpRenderTree::DumpRenderTree):
+
+2009-11-18  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Reviewed by Simon Hausmann.
+
         Fix a code copy and paste error. m_page should be page.
 
         * DumpRenderTree/qt/DumpRenderTree.cpp:
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
index 8a2968d..717af9b 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
@@ -247,17 +247,27 @@ DumpRenderTree::DumpRenderTree()
     qt_drt_overwritePluginDirectories();
     QWebSettings::enablePersistentStorage();
 
-    m_controller = new LayoutTestController(this);
-    connect(m_controller, SIGNAL(done()), this, SLOT(dump()));
-
+    // create our primary testing page/view.
     QWebView *view = new QWebView(0);
     view->resize(QSize(maxViewWidth, maxViewHeight));
     m_page = new WebPage(view, this);
     view->setPage(m_page);
-    connect(m_page, SIGNAL(frameCreated(QWebFrame *)), this, SLOT(connectFrame(QWebFrame *)));
+
+    // create out controllers. This has to be done before connectFrame,
+    // as it exports there to the JavaScript DOM window.
+    m_controller = new LayoutTestController(this);
+    connect(m_controller, SIGNAL(done()), this, SLOT(dump()));
+    m_eventSender = new EventSender(m_page);
+    m_textInputController = new TextInputController(m_page);
+    m_gcController = new GCController(m_page);
+
+    // now connect our different signals
+    connect(m_page, SIGNAL(frameCreated(QWebFrame *)),
+            this, SLOT(connectFrame(QWebFrame *)));
     connectFrame(m_page->mainFrame());
 
-    connect(m_page->mainFrame(), SIGNAL(loadFinished(bool)), m_controller, SLOT(maybeDump(bool)));
+    connect(m_page->mainFrame(), SIGNAL(loadFinished(bool)),
+            m_controller, SLOT(maybeDump(bool)));
 
     connect(m_page->mainFrame(), SIGNAL(titleChanged(const QString&)),
             SLOT(titleChanged(const QString&)));
@@ -266,10 +276,6 @@ DumpRenderTree::DumpRenderTree()
     connect(m_page, SIGNAL(statusBarMessage(const QString&)),
             this, SLOT(statusBarMessage(const QString&)));
 
-    m_eventSender = new EventSender(m_page);
-    m_textInputController = new TextInputController(m_page);
-    m_gcController = new GCController(m_page);
-
     QObject::connect(this, SIGNAL(quit()), qApp, SLOT(quit()), Qt::QueuedConnection);
     qt_drt_run(true);
     QFocusEvent event(QEvent::FocusIn, Qt::ActiveWindowFocusReason);

-- 
WebKit Debian packaging