Title: [129771] trunk/Source/WebCore
Revision
129771
Author
mk...@chromium.org
Date
2012-09-27 09:58:22 -0700 (Thu, 27 Sep 2012)

Log Message

Dropping JSC references from InspectorInstrumentation.h by including 'ScriptState.h'
https://bugs.webkit.org/show_bug.cgi?id=97759

Reviewed by Adam Barth.

InspectorInstrumentation.h includes two '#if USE(JSC)' blocks, which
I've been reliably informed should not appear in WebCore[1]. This patch
drops both blocks, and includes 'ScriptState.h' instead, which should
have the same practical effect.

There's no functional change, so this should be covered by existing tests.

[1]: https://bugs.webkit.org/show_bug.cgi?id=94433#c55

* inspector/InspectorInstrumentation.h:
(WebCore):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (129770 => 129771)


--- trunk/Source/WebCore/ChangeLog	2012-09-27 16:22:47 UTC (rev 129770)
+++ trunk/Source/WebCore/ChangeLog	2012-09-27 16:58:22 UTC (rev 129771)
@@ -1,3 +1,22 @@
+2012-09-27  Mike West  <mk...@chromium.org>
+
+        Dropping JSC references from InspectorInstrumentation.h by including 'ScriptState.h'
+        https://bugs.webkit.org/show_bug.cgi?id=97759
+
+        Reviewed by Adam Barth.
+
+        InspectorInstrumentation.h includes two '#if USE(JSC)' blocks, which
+        I've been reliably informed should not appear in WebCore[1]. This patch
+        drops both blocks, and includes 'ScriptState.h' instead, which should
+        have the same practical effect.
+
+        There's no functional change, so this should be covered by existing tests.
+
+        [1]: https://bugs.webkit.org/show_bug.cgi?id=94433#c55
+
+        * inspector/InspectorInstrumentation.h:
+        (WebCore):
+
 2012-09-27  Erik Arvidsson  <a...@chromium.org>
 
         Remove unused regular expressions from IDLStructure.pm

Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (129770 => 129771)


--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h	2012-09-27 16:22:47 UTC (rev 129770)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h	2012-09-27 16:58:22 UTC (rev 129771)
@@ -37,14 +37,9 @@
 #include "Frame.h"
 #include "Page.h"
 #include "ScriptExecutionContext.h"
+#include "ScriptState.h"
 #include "StorageArea.h"
 
-#if USE(JSC)
-namespace JSC {
-class ExecState;
-}
-#endif
-
 namespace WebCore {
 
 class CSSRule;
@@ -82,12 +77,6 @@
 class WorkerContextProxy;
 class XMLHttpRequest;
 
-#if USE(JSC)
-typedef JSC::ExecState ScriptState;
-#else
-class ScriptState;
-#endif
-
 #if ENABLE(WEB_SOCKETS)
 struct WebSocketFrame;
 class WebSocketHandshakeRequest;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to