Changeset 58876 in webkit

Timestamp:

May 6, 2010 6:00:54 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-05-06 Simon Hausmann <​simon.hausmann@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Replace public inspector url with private property for QtLauncher
​https://bugs.webkit.org/show_bug.cgi?id=35340

Replace the public API with a private dynamic property until this feature
is ready.

• Api/qwebsettings.cpp:
• Api/qwebsettings.h:
• WebCoreSupport/InspectorClientQt.cpp: (WebCore::InspectorClientQt::openInspectorFrontend):
• symbian/bwins/QtWebKitu.def:
• symbian/eabi/QtWebKitu.def:

2010-05-06 Simon Hausmann <​simon.hausmann@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Replace public inspector url with private property for QtLauncher
​https://bugs.webkit.org/show_bug.cgi?id=35340

Replace the public API with a private dynamic property until this feature
is ready.

• QtLauncher/main.cpp: (LauncherWindow::init):

Location:

trunk

Files:

• WebKit/qt/Api/qwebsettings.cpp (modified) (2 diffs)
• WebKit/qt/Api/qwebsettings.h (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/WebCoreSupport/InspectorClientQt.cpp (modified) (1 diff)
• WebKit/qt/symbian/bwins/QtWebKitu.def (modified) (2 diffs)
• WebKit/qt/symbian/eabi/QtWebKitu.def (modified) (2 diffs)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/QtLauncher/main.cpp (modified) (1 diff)

trunk/WebKit/qt/Api/qwebsettings.cpp

@@ -73 +73 @@
     QString offlineWebApplicationCachePath;
     qint64 offlineStorageDefaultQuota;
-    QUrl inspectorLocation;
 
     void apply();
@@ -1005 +1004 @@
 
 /*!
-    \since 4.7
-
-    Specifies the \a location of a frontend to load with each web page when using Web Inspector.
-
-    \sa inspectorUrl()
-*/
-void QWebSettings::setInspectorUrl(const QUrl& location)
-{
-    d->inspectorLocation = location;
-    d->apply();
-}
-
-/*!
-    \since 4.7
-
-    Returns the location of the Web Inspector frontend.
-
-    \sa setInspectorUrl()
-*/
-QUrl QWebSettings::inspectorUrl() const
-{
-    return d->inspectorLocation;
-}
-
-/*!
     \since 4.6
     \relates QWebSettings

trunk/WebKit/qt/Api/qwebsettings.h

@@ -139 +139 @@
     QString localStoragePath() const; 
 
-    void setInspectorUrl(const QUrl &location);
-    QUrl inspectorUrl() const;
-
     static void clearMemoryCaches();
 

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-05-06  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Replace public inspector url with private property for QtLauncher
+        https://bugs.webkit.org/show_bug.cgi?id=35340
+
+        Replace the public API with a private dynamic property until this feature
+        is ready.
+
+        * Api/qwebsettings.cpp:
+        * Api/qwebsettings.h:
+        * WebCoreSupport/InspectorClientQt.cpp:
+        (WebCore::InspectorClientQt::openInspectorFrontend):
+        * symbian/bwins/QtWebKitu.def:
+        * symbian/eabi/QtWebKitu.def:
+
 2010-05-04  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
 

trunk/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp

@@ -89 +89 @@
     inspectorView->setPage(inspectorPage);
 
-    QUrl inspectorUrl = m_inspectedWebPage->settings()->inspectorUrl();
+    QWebInspector* inspector = m_inspectedWebPage->d->getOrCreateInspector();
+    QUrl inspectorUrl = inspector->property("_q_inspectorUrl").toUrl();
     if (!inspectorUrl.isValid())
         inspectorUrl = QUrl("qrc:/webkit/inspector/inspector.html");
     inspectorView->page()->mainFrame()->load(inspectorUrl);
     m_inspectedWebPage->d->inspectorFrontend = inspectorView;
-    m_inspectedWebPage->d->getOrCreateInspector()->d->setFrontend(inspectorView);
+    inspector->d->setFrontend(inspectorView);
 
     inspectorView->page()->d->page->inspectorController()->setInspectorFrontendClient(new InspectorFrontendClientQt(m_inspectedWebPage, inspectorView));

trunk/WebKit/qt/symbian/bwins/QtWebKitu.def

@@ -626 +626 @@
         ?qtwebkit_webframe_scrollRecursively@@YA_NPAVQWebFrame@@HH@Z @ 625 NONAME ABSENT ; bool qtwebkit_webframe_scrollRecursively(class QWebFrame *, int, int)
         ?closeEvent@QWebInspector@@MAEXPAVQCloseEvent@@@Z @ 626 NONAME ; void QWebInspector::closeEvent(class QCloseEvent *)
-        ?inspectorUrl@QWebSettings@@QBE?AVQUrl@@XZ @ 627 NONAME ; class QUrl QWebSettings::inspectorUrl(void) const
+        ?inspectorUrl@QWebSettings@@QBE?AVQUrl@@XZ @ 627 NONAME ABSENT ; class QUrl QWebSettings::inspectorUrl(void) const
         ?isTiledBackingStoreFrozen@QGraphicsWebView@@QBE_NXZ @ 628 NONAME ; bool QGraphicsWebView::isTiledBackingStoreFrozen(void) const
         ?pageChanged@QWebFrame@@IAEXXZ @ 629 NONAME ; void QWebFrame::pageChanged(void)
@@ -647 +647 @@
         ?resizesToContents@QGraphicsWebView@@QBE_NXZ @ 646 NONAME ; bool QGraphicsWebView::resizesToContents(void) const
         ?scrollToAnchor@QWebFrame@@QAEXABVQString@@@Z @ 647 NONAME ; void QWebFrame::scrollToAnchor(class QString const &)
-        ?setInspectorUrl@QWebSettings@@QAEXABVQUrl@@@Z @ 648 NONAME ; void QWebSettings::setInspectorUrl(class QUrl const &)
+        ?setInspectorUrl@QWebSettings@@QAEXABVQUrl@@@Z @ 648 NONAME ABSENT ; void QWebSettings::setInspectorUrl(class QUrl const &)
         ?setResizesToContents@QGraphicsWebView@@QAEX_N@Z @ 649 NONAME ; void QGraphicsWebView::setResizesToContents(bool)
         ?setTiledBackingStoreFrozen@QGraphicsWebView@@QAEX_N@Z @ 650 NONAME ; void QGraphicsWebView::setTiledBackingStoreFrozen(bool)

trunk/WebKit/qt/symbian/eabi/QtWebKitu.def

@@ -713 +713 @@
         _ZN9QWebFrame11pageChangedEv @ 712 NONAME
         _ZN9QWebFrame14scrollToAnchorERK7QString @ 713 NONAME
-        _ZN12QWebSettings15setInspectorUrlERK4QUrl @ 714 NONAME
+        _ZN12QWebSettings15setInspectorUrlERK4QUrl @ 714 NONAME ABSENT
         _ZN13QWebInspector10closeEventEP11QCloseEvent @ 715 NONAME
         _ZN16QGraphicsWebView26setTiledBackingStoreFrozenEb @ 716 NONAME
@@ -720 +720 @@
         _Z19qt_drt_setMediaTypeP9QWebFrameRK7QString @ 719 NONAME
         _Z26qt_drt_enableCaretBrowsingP8QWebPageb @ 720 NONAME
-        _ZNK12QWebSettings12inspectorUrlEv @ 721 NONAME
+        _ZNK12QWebSettings12inspectorUrlEv @ 721 NONAME ABSENT

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-05-06  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Replace public inspector url with private property for QtLauncher
+        https://bugs.webkit.org/show_bug.cgi?id=35340
+
+        Replace the public API with a private dynamic property until this feature
+        is ready.
+
+        * QtLauncher/main.cpp:
+        (LauncherWindow::init):
+
 2010-05-05  Joseph Pecoraro  <joepeck@webkit.org>
 

trunk/WebKitTools/QtLauncher/main.cpp

@@ -238 +238 @@
     connect(this, SIGNAL(enteredFullScreenMode(bool)), this, SLOT(toggleFullScreenMode(bool)));
 
+    m_inspector = new WebInspector(splitter);
     if (!gInspectorUrl.isEmpty())
-      page()->settings()->setInspectorUrl(gInspectorUrl);
-
-    m_inspector = new WebInspector(splitter);
+        m_inspector->setProperty("_q_inspectorUrl", gInspectorUrl);
     m_inspector->setPage(page());
     m_inspector->hide();