[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[kenneth at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 274a7a645828d8f83469ed65b644f28ac7f3920f
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 4 22:00:50 2009 +0000

    Add some missing methods for showing and hiding the
    Web Inspector.
    
    Reviewed by Adam Treat.
    
    * DumpRenderTree/qt/DumpRenderTree.cpp:
    (WebCore::WebPage::WebPage):
    (WebCore::WebPage::~WebPage):
    (WebCore::WebPage::webInspector):
    * DumpRenderTree/qt/DumpRenderTree.h:
    * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
    (LayoutTestController::showWebInspector):
    (LayoutTestController::hideWebInspector):
    * DumpRenderTree/qt/LayoutTestControllerQt.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51715 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index c35d075..a8c7c41 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -10,6 +10,23 @@
 
         Reviewed by Adam Treat.
 
+        Add some missing methods for showing and hiding the
+        Web Inspector.
+
+        * DumpRenderTree/qt/DumpRenderTree.cpp:
+        (WebCore::WebPage::WebPage):
+        (WebCore::WebPage::~WebPage):
+        (WebCore::WebPage::webInspector):
+        * DumpRenderTree/qt/DumpRenderTree.h:
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::showWebInspector):
+        (LayoutTestController::hideWebInspector):
+        * DumpRenderTree/qt/LayoutTestControllerQt.h:
+
+2009-12-04  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Reviewed by Adam Treat.
+
         Implement the setAllowUniversalAccessFromFileURLs method
         for the Qt LayoutTestController.
 
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
index c118543..6d466bf 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
@@ -114,6 +114,7 @@ void NetworkAccessManager::sslErrorsEncountered(QNetworkReply* reply, const QLis
 
 WebPage::WebPage(QObject* parent, DumpRenderTree* drt)
     : QWebPage(parent)
+    , m_webInspector(0)
     , m_drt(drt)
 {
     QWebSettings* globalSettings = QWebSettings::globalSettings();
@@ -139,6 +140,20 @@ WebPage::WebPage(QObject* parent, DumpRenderTree* drt)
     setPluginFactory(new TestPlugin(this));
 }
 
+WebPage::~WebPage()
+{
+    delete m_webInspector;
+}
+
+QWebInspector* WebPage::webInspector()
+{
+    if (!m_webInspector) {
+        m_webInspector = new QWebInspector;
+        m_webInspector->setPage(this);
+    }
+    return m_webInspector;
+}
+
 void WebPage::resetSettings()
 {
     // After each layout test, reset the settings that may have been changed by
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.h b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.h
index 3d1fac3..ab229fe 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.h
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.h
@@ -41,6 +41,7 @@
 #endif
 
 #include <qwebframe.h>
+#include <qwebinspector.h>
 #include <qwebpage.h>
 #include <qwebview.h>
 
@@ -144,6 +145,8 @@ class WebPage : public QWebPage {
     Q_OBJECT
 public:
     WebPage(QObject* parent, DumpRenderTree*);
+    virtual ~WebPage();
+    QWebInspector* webInspector();
 
     QWebPage *createWindow(QWebPage::WebWindowType);
 
@@ -174,6 +177,7 @@ private slots:
             v->setGeometry(r);
     }
 private:
+    QWebInspector* m_webInspector;
     DumpRenderTree *m_drt;
 };
 
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
index 0f68292..0ea5632 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -237,6 +237,17 @@ QString LayoutTestController::decodeHostName(const QString& host)
     return decoded;
 }
 
+void LayoutTestController::showWebInspector()
+{
+    m_drt->webPage()->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
+    m_drt->webPage()->webInspector()->show();
+}
+
+void LayoutTestController::hideWebInspector()
+{
+    m_drt->webPage()->webInspector()->hide();
+}
+
 void LayoutTestController::setAllowUniversalAccessFromFileURLs(bool enabled)
 {
     m_drt->webPage()->settings()->setAttribute(QWebSettings::LocalContentCanAccessRemoteUrls, enabled);
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
index 03397d6..ac8681f 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
@@ -107,6 +107,8 @@ public slots:
     QString encodeHostName(const QString& host);
     QString decodeHostName(const QString& host);
     void dumpSelectionRect() const {}
+    void showWebInspector();
+    void hideWebInspector();
     void setAllowUniversalAccessFromFileURLs(bool enable);
     void setJavaScriptProfilingEnabled(bool enable);
     void setFixedContentsSize(int width, int height);

-- 
WebKit Debian packaging