Changeset 57974 in webkit

Timestamp:

Apr 21, 2010 6:32:56 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-21 Balazs Kelemen <​kb@inf.u-szeged.hu>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Interrupting JavaScript is cumbersome when you use QtLaucher for testing or profiling.
​https://bugs.webkit.org/show_bug.cgi?id=37198

• QtLauncher/main.cpp: (LauncherWindow::toggleInterruptingJavaScriptEnabled): (LauncherWindow::newWindow): (LauncherWindow::cloneWindow): (LauncherWindow::createChrome): (main):
• QtLauncher/webpage.cpp: (WebPage::WebPage): (WebPage::shouldInterruptJavaScript):
• QtLauncher/webpage.h: (WebPage::setInterruptingJavaScriptEnabled):

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• QtLauncher/main.cpp (modified) (6 diffs)
• QtLauncher/webpage.cpp (modified) (2 diffs)
• QtLauncher/webpage.h (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-21  Balazs Kelemen  <kb@inf.u-szeged.hu>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Interrupting JavaScript is cumbersome when you use QtLaucher for testing or profiling.
+        https://bugs.webkit.org/show_bug.cgi?id=37198
+
+        * QtLauncher/main.cpp:
+        (LauncherWindow::toggleInterruptingJavaScriptEnabled):
+        (LauncherWindow::newWindow):
+        (LauncherWindow::cloneWindow):
+        (LauncherWindow::createChrome):
+        (main):
+        * QtLauncher/webpage.cpp:
+        (WebPage::WebPage):
+        (WebPage::shouldInterruptJavaScript):
+        * QtLauncher/webpage.h:
+        (WebPage::setInterruptingJavaScriptEnabled):
+
 2010-04-21  Eric Seidel  <eric@webkit.org>
 

trunk/WebKitTools/QtLauncher/main.cpp

@@ -144 +144 @@
     void changeViewportUpdateMode(int mode);
     void toggleFrameFlattening(bool toggle);
+    void toggleInterruptingJavaScriptEnabled(bool enable);
 
 #if defined(QT_CONFIGURED_WITH_OPENGL)
@@ -152 +153 @@
 
 public slots:
-    void newWindow();
-    void cloneWindow();
+    LauncherWindow* newWindow();
+    LauncherWindow* cloneWindow();
     void updateFPS(int fps);
 
@@ -701 +702 @@
 }
 
+void LauncherWindow::toggleInterruptingJavaScriptEnabled(bool enable)
+{
+    page()->setInterruptingJavaScriptEnabled(enable);
+}
+
 #if defined(QT_CONFIGURED_WITH_OPENGL)
 void LauncherWindow::toggleQGLWidgetViewport(bool enable)
@@ -759 +765 @@
 }
 
-void LauncherWindow::newWindow()
+LauncherWindow* LauncherWindow::newWindow()
 {
     LauncherWindow* mw = new LauncherWindow(this, false);
     mw->show();
-}
-
-void LauncherWindow::cloneWindow()
+    return mw;
+}
+
+LauncherWindow* LauncherWindow::cloneWindow()
 {
     LauncherWindow* mw = new LauncherWindow(this, true);
     mw->show();
+    return mw;
 }
 
@@ -892 +900 @@
     toggleFrameFlattening->setChecked(settings->testAttribute(QWebSettings::FrameFlatteningEnabled));
 
+    QAction* toggleInterruptingJavaScripteEnabled = toolsMenu->addAction("Enable interrupting js scripts", this, SLOT(toggleInterruptingJavaScriptEnabled(bool)));
+    toggleInterruptingJavaScripteEnabled->setCheckable(true);
+    toggleInterruptingJavaScripteEnabled->setChecked(false);
+
 #if defined(QT_CONFIGURED_WITH_OPENGL)
     QAction* toggleQGLWidgetViewport = graphicsViewMenu->addAction("Toggle use of QGLWidget Viewport", this, SLOT(toggleQGLWidgetViewport(bool)));
@@ -1183 +1195 @@
     LauncherWindow* window = 0;
     foreach (QString url, urls) {
+        LauncherWindow* newWindow;
         if (!window)
-            window = new LauncherWindow();
+            newWindow = window = new LauncherWindow();
         else
-            window->newWindow();
-
-        window->load(url);
+            newWindow = window->newWindow();
+
+        newWindow->load(url);
     }
 

trunk/WebKitTools/QtLauncher/webpage.cpp

@@ -40 +40 @@
 WebPage::WebPage(QObject* parent)
     : QWebPage(parent)
+    , m_userAgent()
+    , m_interruptingJavaScriptEnabled(false)
 {
     applyProxy();
@@ -110 +112 @@
     return QWebPage::userAgentForUrl(url);
 }
+
+bool WebPage::shouldInterruptJavaScript()
+{
+    if (!m_interruptingJavaScriptEnabled)
+        return false;
+    return QWebPage::shouldInterruptJavaScript();
+}

trunk/WebKitTools/QtLauncher/webpage.h

@@ -51 +51 @@
 
     QString userAgentForUrl(const QUrl& url) const;
+    void setInterruptingJavaScriptEnabled(bool enabled) { m_interruptingJavaScriptEnabled = enabled; }
 
 public slots:
     void openUrlInDefaultBrowser(const QUrl& url = QUrl());
     void setUserAgent(const QString& ua) { m_userAgent = ua; }
+    bool shouldInterruptJavaScript();
 
 private:
     void applyProxy();
     QString m_userAgent;
+    bool m_interruptingJavaScriptEnabled;
 };