2010-07-20 Hans Wennborg <hans@chromium.org>
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 20 Jul 2010 09:14:40 +0000 (09:14 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 20 Jul 2010 09:14:40 +0000 (09:14 +0000)
        Reviewed by Steve Block.

        Add WebCore/bindings/generic/RuntimeEnabledFeatures.cpp to build files
        https://bugs.webkit.org/show_bug.cgi?id=42380

        RuntimeEnabledFeatures.cpp and .h were moved from bindings/v8 to
        bindings/generic a while a go (in r54593), but need to
        be added to the build in order to be used.

        No new functionality so no new tests.

        * Android.mk:
2010-07-20  Hans Wennborg  <hans@chromium.org>

        Reviewed by Steve Block.

        Add WebCore/bindings/generic/RuntimeEnabledFeatures.cpp to build files
        https://bugs.webkit.org/show_bug.cgi?id=42380

        RuntimeEnabledFeatures.cpp and .h were moved from bindings/v8 to
        bindings/generic a while a go (in r54593), but need to
        be added to the build in order to be used.

        No new functionality so no new tests.

        * Android.mk:
        * CMakeLists.txt:
        * GNUmakefile.am:
        * WebCore.pro:
        * WebCore.vcproj/WebCore.vcproj:
        * WebCore.xcodeproj/project.pbxproj:
        * websockets/WebSocket.cpp: Remove #if USE(V8), as RuntimeEnabledFeatures.cpp is no longer V8-only.
        * websockets/WebSocket.h: Ditto.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@63735 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Android.mk
ChangeLog
WebCore/Android.mk
WebCore/CMakeLists.txt
WebCore/ChangeLog
WebCore/GNUmakefile.am
WebCore/WebCore.pro
WebCore/WebCore.vcproj/WebCore.vcproj
WebCore/WebCore.xcodeproj/project.pbxproj
WebCore/websockets/WebSocket.cpp
WebCore/websockets/WebSocket.h

index 59d956882a3f978846ea86b8a04c9feb42b78610..c0115c17e7c21f27d34cb592767fb2b1be8ad906 100644 (file)
@@ -91,6 +91,7 @@ LOCAL_C_INCLUDES := \
 LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
        $(LOCAL_PATH)/WebCore \
        $(LOCAL_PATH)/WebCore/accessibility \
+       $(LOCAL_PATH)/WebCore/bindings/generic \
        $(LOCAL_PATH)/WebCore/css \
        $(LOCAL_PATH)/WebCore/dom \
        $(LOCAL_PATH)/WebCore/editing \
index 6e9f5bda9f1873b1e09368022fedb0cebd74982a..efa6a7c7a3031eb5bbd47c1aec72d4845b7f71d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2010-07-20  Hans Wennborg  <hans@chromium.org>
+
+        Reviewed by Steve Block.
+
+        Add WebCore/bindings/generic/RuntimeEnabledFeatures.cpp to build files
+        https://bugs.webkit.org/show_bug.cgi?id=42380
+
+        RuntimeEnabledFeatures.cpp and .h were moved from bindings/v8 to
+        bindings/generic a while a go (in r54593), but need to
+        be added to the build in order to be used.
+
+        No new functionality so no new tests.
+
+        * Android.mk:
+
 2010-07-16  Leandro Pereira  <leandro@profusion.mobi>
 
         [EFL] Unreviewed build system cleanup.
index f950952570a167f920036d663670c2f78774f664..da7362cb35df8e94efa5f1acf8c8c319f3d70de5 100644 (file)
@@ -24,6 +24,8 @@
 ##
 
 LOCAL_SRC_FILES := \
+       bindings/generic/RuntimeEnabledFeatures.cpp \
+       \
        css/CSSBorderImageValue.cpp \
        css/CSSCanvasValue.cpp \
        css/CSSCharsetRule.cpp \
index 2cc42ffc9c4876c6f925c339f0735c2b6be3691f..ddd84de325e4c9d61914928c8b3cb63aa0d8c068 100644 (file)
@@ -2,6 +2,7 @@ SET(WebCore_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}"
     "${WEBCORE_DIR}/accessibility"
     "${WEBCORE_DIR}/bindings"
+    "${WEBCORE_DIR}/bindings/generic"
     "${WEBCORE_DIR}/bindings/js"
     "${WEBCORE_DIR}/bridge"
     "${WEBCORE_DIR}/bridge/c"
@@ -558,6 +559,8 @@ SET(WebCore_SOURCES
 
     bindings/ScriptControllerBase.cpp
 
+    bindings/generic/RuntimeEnabledFeatures.cpp
+
     bindings/js/DOMObjectHashTableMap.cpp
     bindings/js/DOMWrapperWorld.cpp
     bindings/js/GCController.cpp
index f192f255e71f0e008b5754d922244531d0651072..ab32296669029c3742b8f244332b3e80edc03f2f 100644 (file)
@@ -1,3 +1,25 @@
+2010-07-20  Hans Wennborg  <hans@chromium.org>
+
+        Reviewed by Steve Block.
+
+        Add WebCore/bindings/generic/RuntimeEnabledFeatures.cpp to build files
+        https://bugs.webkit.org/show_bug.cgi?id=42380
+
+        RuntimeEnabledFeatures.cpp and .h were moved from bindings/v8 to
+        bindings/generic a while a go (in r54593), but need to
+        be added to the build in order to be used.
+
+        No new functionality so no new tests.
+
+        * Android.mk:
+        * CMakeLists.txt:
+        * GNUmakefile.am:
+        * WebCore.pro:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * websockets/WebSocket.cpp: Remove #if USE(V8), as RuntimeEnabledFeatures.cpp is no longer V8-only.
+        * websockets/WebSocket.h: Ditto.
+
 2010-07-20  Tony Chang  <tony@chromium.org>
 
         Reviewed by Kent Tamura.
index ae85b5b62e9e90f4478f7bc0d4876fe92c5fd5b8..2aac9a1b030ad13eb52feb0af4a3f3fb0aa29ccd 100644 (file)
@@ -14,6 +14,7 @@ webcore_cppflags += \
        -I$(srcdir)/WebKit/gtk/webkit \
        -I$(srcdir)/WebCore \
        -I$(srcdir)/WebCore/accessibility \
+       -I$(srcdir)/WebCore/bindings/generic \
        -I$(srcdir)/WebCore/bindings/js \
        -I$(srcdir)/WebCore/bindings/gobject \
        -I$(srcdir)/WebCore/bridge \
@@ -620,6 +621,8 @@ webcore_sources += \
        WebCore/accessibility/AccessibilityTableHeaderContainer.h \
        WebCore/accessibility/AccessibilityTableRow.cpp \
        WebCore/accessibility/AccessibilityTableRow.h \
+       WebCore/bindings/generic/RuntimeEnabledFeatures.cpp \
+       WebCore/bindings/generic/RuntimeEnabledFeatures.h \
        WebCore/bindings/js/CachedScriptSourceProvider.h \
        WebCore/bindings/js/DOMObjectHashTableMap.cpp \
        WebCore/bindings/js/DOMObjectHashTableMap.h \
index 450d22c1c75816fde706240ef7cc1e1c6c2feb74..f342dba4417399d4d1db932f15c3a768485a78a1 100644 (file)
@@ -172,6 +172,7 @@ INCLUDEPATH = \
     $$PWD \
     $$PWD/accessibility \
     $$PWD/bindings \
+    $$PWD/bindings/generic \
     $$PWD/bindings/js \
     $$PWD/bridge \
     $$PWD/bridge/c \
@@ -267,6 +268,7 @@ SOURCES += \
     accessibility/AccessibilityTableHeaderContainer.cpp \    
     accessibility/AccessibilityTableRow.cpp \    
     accessibility/AXObjectCache.cpp \
+    bindings/generic/RuntimeEnabledFeatures.cpp \
     bindings/js/GCController.cpp \
     bindings/js/DOMObjectHashTableMap.cpp \
     bindings/js/DOMWrapperWorld.cpp \
index 205d942a4c3266d550340c418579b1ffcb27f4d4..0024251929d379e184bf280c315f93b89aee334f 100644 (file)
                                RelativePath="..\bindings\ScriptControllerBase.h"\r
                                >\r
                        </File>\r
+                       <Filter name="generic"\r
+                               >\r
+                               <File\r
+                                       RelativePath="..\bindings\generic\RuntimeEnabledFeatures.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\bindings\generic\RuntimeEnabledFeatures.h"\r
+                                       >\r
+                               </File>\r
+                       </Filter>\r
                        <Filter\r
                                Name="js"\r
                                >\r
index 1e8a887352e93dd308e04058cbf4bf28c423b894..532e268f19d8a131ea12495b5df09c9c1d750326 100644 (file)
                8AF4E55611DC5A36000ED3DE /* Navigation.h in Headers */ = {isa = PBXBuildFile; fileRef = 8AF4E55311DC5A36000ED3DE /* Navigation.h */; };
                8AF4E55B11DC5A63000ED3DE /* Timing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8AF4E55811DC5A63000ED3DE /* Timing.cpp */; };
                8AF4E55C11DC5A63000ED3DE /* Timing.h in Headers */ = {isa = PBXBuildFile; fileRef = 8AF4E55911DC5A63000ED3DE /* Timing.h */; };
+               8C6EA61911EF7E0400FD8EE3 /* RuntimeEnabledFeatures.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8C6EA61711EF7E0400FD8EE3 /* RuntimeEnabledFeatures.cpp */; };
+               8C6EA61A11EF7E0400FD8EE3 /* RuntimeEnabledFeatures.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C6EA61811EF7E0400FD8EE3 /* RuntimeEnabledFeatures.h */; };
                8FAC774D119872CB0015AE94 /* JSMainThreadExecState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F934D841189F1EE00508D5D /* JSMainThreadExecState.cpp */; };
                9302B0BD0D79F82900C7EE83 /* PageGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9302B0BC0D79F82900C7EE83 /* PageGroup.cpp */; };
                9302B0BF0D79F82C00C7EE83 /* PageGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 9302B0BE0D79F82C00C7EE83 /* PageGroup.h */; settings = {ATTRIBUTES = (Private, ); }; };
                8AF4E55811DC5A63000ED3DE /* Timing.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Timing.cpp; sourceTree = "<group>"; };
                8AF4E55911DC5A63000ED3DE /* Timing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Timing.h; sourceTree = "<group>"; };
                8AF4E55A11DC5A63000ED3DE /* Timing.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Timing.idl; sourceTree = "<group>"; };
+               8C6EA61711EF7E0400FD8EE3 /* RuntimeEnabledFeatures.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RuntimeEnabledFeatures.cpp; path = generic/RuntimeEnabledFeatures.cpp; sourceTree = "<group>"; };
+               8C6EA61811EF7E0400FD8EE3 /* RuntimeEnabledFeatures.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RuntimeEnabledFeatures.h; path = generic/RuntimeEnabledFeatures.h; sourceTree = "<group>"; };
                8F934D831189F1EE00508D5D /* JSMainThreadExecState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMainThreadExecState.h; sourceTree = "<group>"; };
                8F934D841189F1EE00508D5D /* JSMainThreadExecState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMainThreadExecState.cpp; sourceTree = "<group>"; };
                9302B0BC0D79F82900C7EE83 /* PageGroup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageGroup.cpp; sourceTree = "<group>"; };
                BC1A3790097C6F970019F3D8 /* bindings */ = {
                        isa = PBXGroup;
                        children = (
+                               8C6EA61711EF7E0400FD8EE3 /* RuntimeEnabledFeatures.cpp */,
+                               8C6EA61811EF7E0400FD8EE3 /* RuntimeEnabledFeatures.h */,
                                BC1A3793097C6FB10019F3D8 /* js */,
                                BC1A3794097C6FC40019F3D8 /* objc */,
                                93F8B3050A300FE100F61AB8 /* CodeGenerator.pm */,
                                E1BE512E0CF6C512002EA959 /* XSLTUnicodeSort.h in Headers */,
                                97DD4D870FDF4D6E00ECF9A4 /* XSSAuditor.h in Headers */,
                                CE172E011136E8CE0062A533 /* ZoomMode.h in Headers */,
+                               8C6EA61A11EF7E0400FD8EE3 /* RuntimeEnabledFeatures.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                93F19B0508245E59001E9ABC /* XSLTProcessorLibxslt.cpp in Sources */,
                                E1BE512D0CF6C512002EA959 /* XSLTUnicodeSort.cpp in Sources */,
                                97DD4D860FDF4D6E00ECF9A4 /* XSSAuditor.cpp in Sources */,
+                               8C6EA61911EF7E0400FD8EE3 /* RuntimeEnabledFeatures.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
index 91761fba76603c4ff8ff21c2015e68cc07d8166b..38629d74925fdf822d08162cbafa229e1cbd0d33 100644 (file)
@@ -78,8 +78,6 @@ static String encodeProtocolString(const String& protocol)
     return builder.toString();
 }
 
-#if USE(V8)
-
 static bool webSocketsAvailable = false;
 
 void WebSocket::setIsAvailable(bool available)
@@ -92,8 +90,6 @@ bool WebSocket::isAvailable()
     return webSocketsAvailable;
 }
 
-#endif
-
 WebSocket::WebSocket(ScriptExecutionContext* context)
     : ActiveDOMObject(context, this)
     , m_state(CONNECTING)
index b2102d14a8c31431590cea780e6e82de4a73fe5b..2c95ff9d56347a2cd5a2e5a0eef1d79cf89890f7 100644 (file)
@@ -50,10 +50,8 @@ namespace WebCore {
 
     class WebSocket : public RefCounted<WebSocket>, public EventTarget, public ActiveDOMObject, public WebSocketChannelClient {
     public:
-#if USE(V8)
         static void setIsAvailable(bool);
         static bool isAvailable();
-#endif
         static PassRefPtr<WebSocket> create(ScriptExecutionContext* context) { return adoptRef(new WebSocket(context)); }
         virtual ~WebSocket();