[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 00:52:20 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 7bc6f0a02cc34b5617c0f2e227cf0e6598415cbc
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 30 16:43:55 2009 +0000
2009-12-30 Laszlo Gombos <laszlo.1.gombos at nokia.com>
Reviewed by Simon Hausmann.
[Qt] It should be possible to disable inspector
https://bugs.webkit.org/show_bug.cgi?id=32724
This change fixes the build break. Some QtWebKit interfaces
will not be fully functional (most notable QWebInspector) if
INSPECTOR is disabled.
* Api/qwebinspector.cpp:
(QWebInspector::showEvent):
(QWebInspector::closeEvent):
* Api/qwebpage.cpp:
(webActionForContextMenuAction):
(QWebPagePrivate::getOrCreateInspector):
(QWebPagePrivate::inspectorController):
(QWebPage::triggerAction):
(QWebPage::updatePositionDependentActions):
* WebCoreSupport/InspectorClientQt.cpp:
(WebCore::InspectorClientQt::showWindow):
(WebCore::InspectorClientQt::closeWindow):
2009-12-30 Laszlo Gombos <laszlo.1.gombos at nokia.com>
Reviewed by Simon Hausmann.
[Qt] It should be possible to disable inspector
https://bugs.webkit.org/show_bug.cgi?id=32724
This makes the r48430 available for other ports as well.
No new tests, as there is no new functionality.
* inspector/InjectedScriptHost.idl: Guard the interface with
INSPECTOR guard.
* inspector/InspectorBackend.idl: Ditto.
* inspector/InspectorFrontendHost.idl: Ditto.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52662 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1303d0a..9b187d3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2009-12-30 Laszlo Gombos <laszlo.1.gombos at nokia.com>
+
+ Reviewed by Simon Hausmann.
+
+ [Qt] It should be possible to disable inspector
+ https://bugs.webkit.org/show_bug.cgi?id=32724
+
+ This makes the r48430 available for other ports as well.
+ No new tests, as there is no new functionality.
+
+ * inspector/InjectedScriptHost.idl: Guard the interface with
+ INSPECTOR guard.
+
+ * inspector/InspectorBackend.idl: Ditto.
+
+ * inspector/InspectorFrontendHost.idl: Ditto.
+
2009-12-30 Dimitri Glazkov <dglazkov at chromium.org>
Reviewed by Adam Barth.
diff --git a/WebCore/inspector/InjectedScriptHost.idl b/WebCore/inspector/InjectedScriptHost.idl
index 7d15895..c3d0092 100644
--- a/WebCore/inspector/InjectedScriptHost.idl
+++ b/WebCore/inspector/InjectedScriptHost.idl
@@ -31,7 +31,7 @@
*/
module core {
- interface InjectedScriptHost {
+ interface [Conditional=INSPECTOR] InjectedScriptHost {
[Custom] DOMWindow inspectedWindow();
[Custom] DOMObject wrapCallback(in DOMObject callback);
void clearConsoleMessages();
diff --git a/WebCore/inspector/InspectorBackend.idl b/WebCore/inspector/InspectorBackend.idl
index 40d1006..351d244 100644
--- a/WebCore/inspector/InspectorBackend.idl
+++ b/WebCore/inspector/InspectorBackend.idl
@@ -31,7 +31,7 @@
*/
module core {
- interface InspectorBackend {
+ interface [Conditional=INSPECTOR] InspectorBackend {
void storeLastActivePanel(in DOMString panelName);
void saveFrontendSettings(in DOMString settings);
diff --git a/WebCore/inspector/InspectorFrontendHost.idl b/WebCore/inspector/InspectorFrontendHost.idl
index 52510f4..66bad41 100644
--- a/WebCore/inspector/InspectorFrontendHost.idl
+++ b/WebCore/inspector/InspectorFrontendHost.idl
@@ -31,7 +31,7 @@
*/
module core {
- interface InspectorFrontendHost {
+ interface [Conditional=INSPECTOR] InspectorFrontendHost {
void loaded();
void attach();
void detach();
diff --git a/WebKit/qt/Api/qwebinspector.cpp b/WebKit/qt/Api/qwebinspector.cpp
index b2d7b28..c3ef530 100644
--- a/WebKit/qt/Api/qwebinspector.cpp
+++ b/WebKit/qt/Api/qwebinspector.cpp
@@ -151,9 +151,11 @@ void QWebInspector::resizeEvent(QResizeEvent* event)
/*! \reimp */
void QWebInspector::showEvent(QShowEvent* event)
{
+#if ENABLE(INSPECTOR)
// Allows QWebInspector::show() to init the inspector.
if (d->page)
d->page->d->inspectorController()->show();
+#endif
}
/*! \reimp */
@@ -164,8 +166,10 @@ void QWebInspector::hideEvent(QHideEvent* event)
/*! \reimp */
void QWebInspector::closeEvent(QCloseEvent* event)
{
+#if ENABLE(INSPECTOR)
if (d->page)
d->page->d->inspectorController()->setWindowVisible(false);
+#endif
}
/*! \internal */
diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index c3579e0..7ed7555 100644
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -462,7 +462,9 @@ static QWebPage::WebAction webActionForContextMenuAction(WebCore::ContextMenuAct
case WebCore::ContextMenuItemTagBold: return QWebPage::ToggleBold;
case WebCore::ContextMenuItemTagItalic: return QWebPage::ToggleItalic;
case WebCore::ContextMenuItemTagUnderline: return QWebPage::ToggleUnderline;
+#if ENABLE(INSPECTOR)
case WebCore::ContextMenuItemTagInspectElement: return QWebPage::InspectElement;
+#endif
default: break;
}
return QWebPage::NoWebAction;
@@ -1480,6 +1482,7 @@ void QWebPagePrivate::setInspector(QWebInspector* insp)
*/
QWebInspector* QWebPagePrivate::getOrCreateInspector()
{
+#if ENABLE(INSPECTOR)
if (!inspector) {
QWebInspector* insp = new QWebInspector;
insp->setPage(q);
@@ -1487,13 +1490,18 @@ QWebInspector* QWebPagePrivate::getOrCreateInspector()
Q_ASSERT(inspector); // Associated through QWebInspector::setPage(q)
}
+#endif
return inspector;
}
/*! \internal */
InspectorController* QWebPagePrivate::inspectorController()
{
+#if ENABLE(INSPECTOR)
return page->inspectorController();
+#else
+ return 0;
+#endif
}
@@ -2035,11 +2043,13 @@ void QWebPage::triggerAction(WebAction action, bool)
editor->setBaseWritingDirection(RightToLeftWritingDirection);
break;
case InspectElement: {
+#if ENABLE(INSPECTOR)
if (!d->hitTestResult.isNull()) {
d->getOrCreateInspector(); // Make sure the inspector is created
d->inspector->show(); // The inspector is expected to be shown on inspection
d->page->inspectorController()->inspect(d->hitTestResult.d->innerNonSharedNode.get());
}
+#endif
break;
}
default:
@@ -2733,8 +2743,11 @@ void QWebPage::updatePositionDependentActions(const QPoint &pos)
d->hitTestResult = QWebHitTestResult(new QWebHitTestResultPrivate(result));
WebCore::ContextMenu menu(result);
menu.populate();
+
+#if ENABLE(INSPECTOR)
if (d->page->inspectorController()->enabled())
menu.addInspectElementItem();
+#endif
QBitArray visitedWebActions(QWebPage::WebActionCount);
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index e4f57c3..38d6135 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,27 @@
+2009-12-30 Laszlo Gombos <laszlo.1.gombos at nokia.com>
+
+ Reviewed by Simon Hausmann.
+
+ [Qt] It should be possible to disable inspector
+ https://bugs.webkit.org/show_bug.cgi?id=32724
+
+ This change fixes the build break. Some QtWebKit interfaces
+ will not be fully functional (most notable QWebInspector) if
+ INSPECTOR is disabled.
+
+ * Api/qwebinspector.cpp:
+ (QWebInspector::showEvent):
+ (QWebInspector::closeEvent):
+ * Api/qwebpage.cpp:
+ (webActionForContextMenuAction):
+ (QWebPagePrivate::getOrCreateInspector):
+ (QWebPagePrivate::inspectorController):
+ (QWebPage::triggerAction):
+ (QWebPage::updatePositionDependentActions):
+ * WebCoreSupport/InspectorClientQt.cpp:
+ (WebCore::InspectorClientQt::showWindow):
+ (WebCore::InspectorClientQt::closeWindow):
+
2009-12-30 Janne Koskinen <janne.p.koskinen at digia.com>
Reviewed by Simon Hausmann.
diff --git a/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp b/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
index d5683c4..1caf96d 100644
--- a/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
@@ -112,12 +112,16 @@ void InspectorClientQt::showWindow()
{
updateWindowTitle();
+#if ENABLE(INSPECTOR)
m_inspectedWebPage->d->inspectorController()->setWindowVisible(true, true);
+#endif
}
void InspectorClientQt::closeWindow()
{
+#if ENABLE(INSPECTOR)
m_inspectedWebPage->d->inspectorController()->setWindowVisible(false);
+#endif
}
void InspectorClientQt::attachWindow()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list