[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Thu Apr 8 01:59:53 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 7c2fa1c31ba18c433d1fe2d4b499f372c1c782b8
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Feb 26 09:56:05 2010 +0000
2010-02-26 Jamey Hicks <jamey.hicks at nokia.com>
Reviewed by Laszlo Gombos.
[Qt] added QWebSettings::setInspectorUrl() and QWebSettings::inspectorUrl()
Enables the use of alternate Web Inspector frontends by changing
the location of the frontend.
This is required so that the Web Inspector may be run from an
external process or an external tool such as Eclipse or Aptana may
be used instead of the in-process Web Inspector UI.
https://bugs.webkit.org/show_bug.cgi?id=35340
* Api/qwebsettings.cpp:
(QWebSettings::QWebSettings):
(QWebSettings::setInspectorUrl):
(QWebSettings::inspectorUrl):
* Api/qwebsettings.h:
* WebCoreSupport/InspectorClientQt.cpp:
(WebCore::InspectorClientQt::createPage):
2010-02-26 Jamey Hicks <jamey.hicks at nokia.com>
Reviewed by Laszlo Gombos.
[Qt] added QWebSettings::setInspectorUrl() and QWebSettings::inspectorUrl()
Enables the use of alternate Web Inspector frontends by changing
the location of the frontend. The location is specified by providing
-inspector-url url
as an argument to QtLauncher.
This is required so that the Web Inspector may be run from an
external process or an external tool such as Eclipse or Aptana may
be used instead of the in-process Web Inspector UI.
https://bugs.webkit.org/show_bug.cgi?id=35340
* QtLauncher/main.cpp:
(LauncherWindow::init):
(LauncherApplication::handleUserOptions):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55273 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/qt/Api/qwebsettings.cpp b/WebKit/qt/Api/qwebsettings.cpp
index e6fdf61..b6b58da 100644
--- a/WebKit/qt/Api/qwebsettings.cpp
+++ b/WebKit/qt/Api/qwebsettings.cpp
@@ -73,6 +73,7 @@ public:
QString localStoragePath;
QString offlineWebApplicationCachePath;
qint64 offlineStorageDefaultQuota;
+ QUrl inspectorLocation;
void apply();
WebCore::Settings* settings;
@@ -949,6 +950,31 @@ void QWebSettings::setLocalStoragePath(const QString& path)
}
/*!
+ \since 4.7
+
+ Specifies the 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
diff --git a/WebKit/qt/Api/qwebsettings.h b/WebKit/qt/Api/qwebsettings.h
index 29c01b6..83cf772 100644
--- a/WebKit/qt/Api/qwebsettings.h
+++ b/WebKit/qt/Api/qwebsettings.h
@@ -134,6 +134,9 @@ public:
void setLocalStoragePath(const QString& path);
QString localStoragePath() const;
+ void setInspectorUrl(const QUrl &location);
+ QUrl inspectorUrl() const;
+
static void clearMemoryCaches();
static void enablePersistentStorage(const QString& path = QString());
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index bdb172f..3ef61a0 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,26 @@
+2010-02-26 Jamey Hicks <jamey.hicks at nokia.com>
+
+ Reviewed by Laszlo Gombos.
+
+ [Qt] added QWebSettings::setInspectorUrl() and QWebSettings::inspectorUrl()
+
+ Enables the use of alternate Web Inspector frontends by changing
+ the location of the frontend.
+
+ This is required so that the Web Inspector may be run from an
+ external process or an external tool such as Eclipse or Aptana may
+ be used instead of the in-process Web Inspector UI.
+
+ https://bugs.webkit.org/show_bug.cgi?id=35340
+
+ * Api/qwebsettings.cpp:
+ (QWebSettings::QWebSettings):
+ (QWebSettings::setInspectorUrl):
+ (QWebSettings::inspectorUrl):
+ * Api/qwebsettings.h:
+ * WebCoreSupport/InspectorClientQt.cpp:
+ (WebCore::InspectorClientQt::createPage):
+
2010-02-25 Jarkko Sakkinen <jarkko.sakkinen at tieto.com>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp b/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
index 5f343ff..cde64c8 100644
--- a/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
@@ -91,7 +91,10 @@ Page* InspectorClientQt::createPage()
m_inspectorView.set(inspectorView);
}
- inspectorView->page()->mainFrame()->load(QString::fromLatin1("qrc:/webkit/inspector/inspector.html"));
+ QUrl inspectorUrl = m_inspectedWebPage->settings()->inspectorUrl();
+ 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);
diff --git a/WebKit/qt/WebCoreSupport/InspectorClientQt.h b/WebKit/qt/WebCoreSupport/InspectorClientQt.h
index 923bab4..c9548b0 100644
--- a/WebKit/qt/WebCoreSupport/InspectorClientQt.h
+++ b/WebKit/qt/WebCoreSupport/InspectorClientQt.h
@@ -38,45 +38,45 @@ class QWebPage;
class QWebView;
namespace WebCore {
- class Node;
- class Page;
- class String;
+class Node;
+class Page;
+class String;
- class InspectorClientQt : public InspectorClient {
- public:
- InspectorClientQt(QWebPage*);
+class InspectorClientQt : public InspectorClient {
+public:
+ InspectorClientQt(QWebPage*);
- virtual void inspectorDestroyed();
+ virtual void inspectorDestroyed();
- virtual Page* createPage();
+ virtual Page* createPage();
- virtual String localizedStringsURL();
+ virtual String localizedStringsURL();
- virtual String hiddenPanels();
+ virtual String hiddenPanels();
- virtual void showWindow();
- virtual void closeWindow();
+ virtual void showWindow();
+ virtual void closeWindow();
- virtual void attachWindow();
- virtual void detachWindow();
+ virtual void attachWindow();
+ virtual void detachWindow();
- virtual void setAttachedWindowHeight(unsigned height);
+ virtual void setAttachedWindowHeight(unsigned height);
- virtual void highlight(Node*);
- virtual void hideHighlight();
- virtual void inspectedURLChanged(const String& newURL);
+ virtual void highlight(Node*);
+ virtual void hideHighlight();
+ virtual void inspectedURLChanged(const String& newURL);
- virtual void populateSetting(const String& key, String* value);
- virtual void storeSetting(const String& key, const String& value);
+ virtual void populateSetting(const String& key, String* value);
+ virtual void storeSetting(const String& key, const String& value);
- virtual void inspectorWindowObjectCleared();
+ virtual void inspectorWindowObjectCleared();
- private:
- void updateWindowTitle();
- QWebPage* m_inspectedWebPage;
- OwnPtr<QWebView> m_inspectorView;
- QString m_inspectedURL;
- };
+private:
+ void updateWindowTitle();
+ QWebPage* m_inspectedWebPage;
+ OwnPtr<QWebView> m_inspectorView;
+ QString m_inspectedURL;
+};
}
#endif
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 38a7c60..2b765df 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,24 @@
+2010-02-26 Jamey Hicks <jamey.hicks at nokia.com>
+
+ Reviewed by Laszlo Gombos.
+
+ [Qt] added QWebSettings::setInspectorUrl() and QWebSettings::inspectorUrl()
+
+ Enables the use of alternate Web Inspector frontends by changing
+ the location of the frontend. The location is specified by providing
+ -inspector-url url
+ as an argument to QtLauncher.
+
+ This is required so that the Web Inspector may be run from an
+ external process or an external tool such as Eclipse or Aptana may
+ be used instead of the in-process Web Inspector UI.
+
+ https://bugs.webkit.org/show_bug.cgi?id=35340
+
+ * QtLauncher/main.cpp:
+ (LauncherWindow::init):
+ (LauncherApplication::handleUserOptions):
+
2010-02-25 Dirk Pranke <dpranke at chromium.org>
Reviewed by Eric Seidel.
diff --git a/WebKitTools/QtLauncher/main.cpp b/WebKitTools/QtLauncher/main.cpp
index 2d58297..fe6a743 100644
--- a/WebKitTools/QtLauncher/main.cpp
+++ b/WebKitTools/QtLauncher/main.cpp
@@ -76,7 +76,7 @@ static bool gUseCompositing = false;
static bool gCacheWebView = false;
static bool gShowFrameRate = false;
static QGraphicsView::ViewportUpdateMode gViewportUpdateMode = QGraphicsView::MinimalViewportUpdate;
-
+static QUrl gInspectorUrl;
class LauncherWindow : public MainWindow {
Q_OBJECT
@@ -190,6 +190,9 @@ void LauncherWindow::init(bool useGraphicsView)
connect(page(), SIGNAL(linkHovered(const QString&, const QString&, const QString&)),
this, SLOT(showLinkHover(const QString&, const QString&)));
+ if (!gInspectorUrl.isEmpty())
+ page()->settings()->setInspectorUrl(gInspectorUrl);
+
inspector = new WebInspector(splitter);
inspector->setPage(page());
inspector->hide();
@@ -720,6 +723,7 @@ void LauncherApplication::handleUserOptions()
<< "[-cache-webview]"
<< "[-show-fps]"
<< "[-r list]"
+ << "[-inspector-url location]"
<< "URLs";
appQuit(0);
}
@@ -757,6 +761,11 @@ void LauncherApplication::handleUserOptions()
gViewportUpdateMode = static_cast<QGraphicsView::ViewportUpdateMode>(idx);
}
+ QString inspectorUrlArg("-inspector-url");
+ int inspectorUrlIndex = args.indexOf(inspectorUrlArg);
+ if (inspectorUrlIndex != -1)
+ gInspectorUrl = takeOptionValue(&args, inspectorUrlIndex);
+
int robotIndex = args.indexOf("-r");
if (robotIndex != -1) {
QString listFile = takeOptionValue(&args, robotIndex);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list