[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
podivilov at chromium.org
podivilov at chromium.org
Wed Dec 22 14:22:13 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit c162d93006b1a82e33e255a71da1cf3c1d0a4aaa
Author: podivilov at chromium.org <podivilov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 7 10:37:02 2010 +0000
2010-10-07 Pavel Podivilov <podivilov at chromium.org>
Unreviewed, build fix.
Build fix for r69283.
* dom/Document.cpp:
(WebCore::Document::inspectorController):
* dom/Document.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69286 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 418950e..40bdd21 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-07 Pavel Podivilov <podivilov at chromium.org>
+
+ Unreviewed, build fix.
+
+ Build fix for r69283.
+
+ * dom/Document.cpp:
+ (WebCore::Document::inspectorController):
+ * dom/Document.h:
+
2010-10-07 Carlos Garcia Campos <cgarcia at igalia.com>
Reviewed by Xan Lopez.
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index 2848e00..c311ca2 100644
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -4679,6 +4679,13 @@ bool Document::isXHTMLMPDocument() const
}
#endif
+#if ENABLE(INSPECTOR)
+InspectorController* Document::inspectorController() const
+{
+ return page() ? page()->inspectorController() : 0;
+}
+#endif
+
#if ENABLE(FULLSCREEN_API)
void Document::webkitRequestFullScreenForElement(Element* element, unsigned short flags)
{
diff --git a/WebCore/dom/Document.h b/WebCore/dom/Document.h
index 2eaaa4b..cf10b49 100644
--- a/WebCore/dom/Document.h
+++ b/WebCore/dom/Document.h
@@ -88,6 +88,7 @@ class HTMLInputElement;
class HTMLMapElement;
class HitTestRequest;
class HitTestResult;
+class InspectorController;
class IntPoint;
class DOMWrapperWorld;
class JSNode;
@@ -479,6 +480,9 @@ public:
Frame* frame() const { return m_frame; } // can be NULL
Page* page() const; // can be NULL
Settings* settings() const; // can be NULL
+#if ENABLE(INSPECTOR)
+ virtual InspectorController* inspectorController() const; // can be NULL
+#endif
PassRefPtr<Range> createRange();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list