Created
March 8, 2012 21:54
-
-
Save torarnv/2003704 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
commit 78cb78a4d73a0f8be8a46fa1e0160dc01ec7c89a | |
Author: Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | |
Date: Thu Mar 8 22:53:02 2012 +0100 | |
Prospective build fix for Qt minimal after r110191 | |
https://bugs.webkit.org/show_bug.cgi?id=80338 | |
* testing/Internals.cpp: | |
(WebCore): | |
* testing/Internals.h: | |
(Internals): | |
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog | |
index d115b42..05625ca 100644 | |
--- a/Source/WebCore/ChangeLog | |
+++ b/Source/WebCore/ChangeLog | |
@@ -1,5 +1,16 @@ | |
2012-03-08 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | |
+ Prospective build fix for Qt minimal after r110191 | |
+ | |
+ https://bugs.webkit.org/show_bug.cgi?id=80338 | |
+ | |
+ * testing/Internals.cpp: | |
+ (WebCore): | |
+ * testing/Internals.h: | |
+ (Internals): | |
+ | |
+2012-03-08 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | |
+ | |
[Qt] Prospective Windows build fix | |
Don't assume that windows-builds will always run inside a cmd.exe shell. | |
diff --git a/Source/WebCore/testing/Internals.cpp b/Source/WebCore/testing/Internals.cpp | |
index 06af83f..6bdf068 100644 | |
--- a/Source/WebCore/testing/Internals.cpp | |
+++ b/Source/WebCore/testing/Internals.cpp | |
@@ -337,6 +337,7 @@ PassRefPtr<ClientRect> Internals::boundingBox(Element* element, ExceptionCode& e | |
return ClientRect::create(renderer->absoluteBoundingBoxRectIgnoringTransforms()); | |
} | |
+#if ENABLE(INSPECTOR) | |
PassRefPtr<ClientRectList> Internals::inspectorHighlightRects(Document* document, ExceptionCode& ec) | |
{ | |
if (!document || !document->page() || !document->page()->inspectorController()) { | |
@@ -348,6 +349,7 @@ PassRefPtr<ClientRectList> Internals::inspectorHighlightRects(Document* document | |
document->page()->inspectorController()->getHighlight(&highlight); | |
return ClientRectList::create(highlight.quads); | |
} | |
+#endif | |
unsigned Internals::markerCountForNode(Node* node, const String& markerType, ExceptionCode& ec) | |
{ | |
diff --git a/Source/WebCore/testing/Internals.h b/Source/WebCore/testing/Internals.h | |
index de0a3cb..07ed38f 100644 | |
--- a/Source/WebCore/testing/Internals.h | |
+++ b/Source/WebCore/testing/Internals.h | |
@@ -89,7 +89,9 @@ public: | |
PassRefPtr<ClientRect> boundingBox(Element*, ExceptionCode&); | |
+#if ENABLE(INSPECTOR) | |
PassRefPtr<ClientRectList> inspectorHighlightRects(Document*, ExceptionCode&); | |
+#endif | |
unsigned markerCountForNode(Node*, const String&, ExceptionCode&); | |
PassRefPtr<Range> markerRangeForNode(Node*, const String& markerType, unsigned index, ExceptionCode&); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment