[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 11:21:16 UTC 2010 

The following commit has been merged in the debian/experimental branch:
commit 6f46a60d4ed3f56f3d91a2e559c1b83223ea71b7
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 20 09:14:40 2010 +0000

    2010-07-20  Hans Wennborg  <hans at 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-20  Hans Wennborg  <hans at 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: http://svn.webkit.org/repository/webkit/trunk@63735 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Android.mk b/Android.mk
index 59d9568..c0115c1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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 \
diff --git a/ChangeLog b/ChangeLog
index 6e9f5bd..efa6a7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2010-07-20  Hans Wennborg  <hans at 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 at profusion.mobi>
 
         [EFL] Unreviewed build system cleanup.
diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index f950952..da7362c 100644
--- a/WebCore/Android.mk
+++ b/WebCore/Android.mk
@@ -24,6 +24,8 @@
 ##
 
 LOCAL_SRC_FILES := \
+	bindings/generic/RuntimeEnabledFeatures.cpp \
+	\
 	css/CSSBorderImageValue.cpp \
 	css/CSSCanvasValue.cpp \
 	css/CSSCharsetRule.cpp \
diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt
index 2cc42ff..ddd84de 100644
--- a/WebCore/CMakeLists.txt
+++ b/WebCore/CMakeLists.txt
@@ -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
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f192f25..ab32296 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,25 @@
+2010-07-20  Hans Wennborg  <hans at 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 at chromium.org>
 
         Reviewed by Kent Tamura.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index ae85b5b..2aac9a1 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -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 \
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 450d22c..f342dba 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -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 \
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index 205d942..0024251 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -40620,6 +40620,17 @@
 				RelativePath="..\bindings\ScriptControllerBase.h"
 				>
 			</File>
+			<Filter name="generic"
+				>
+				<File
+					RelativePath="..\bindings\generic\RuntimeEnabledFeatures.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\bindings\generic\RuntimeEnabledFeatures.h"
+					>
+				</File>
+			</Filter>
 			<Filter
 				Name="js"
 				>
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index 1e8a887..532e268 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -2336,6 +2336,8 @@
 		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, ); }; };
@@ -8060,6 +8062,8 @@
 		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>"; };
@@ -15608,6 +15612,8 @@
 		BC1A3790097C6F970019F3D8 /* bindings */ = {
 			isa = PBXGroup;
 			children = (
+				8C6EA61711EF7E0400FD8EE3 /* RuntimeEnabledFeatures.cpp */,
+				8C6EA61811EF7E0400FD8EE3 /* RuntimeEnabledFeatures.h */,
 				BC1A3793097C6FB10019F3D8 /* js */,
 				BC1A3794097C6FC40019F3D8 /* objc */,
 				93F8B3050A300FE100F61AB8 /* CodeGenerator.pm */,
@@ -19825,6 +19831,7 @@
 				E1BE512E0CF6C512002EA959 /* XSLTUnicodeSort.h in Headers */,
 				97DD4D870FDF4D6E00ECF9A4 /* XSSAuditor.h in Headers */,
 				CE172E011136E8CE0062A533 /* ZoomMode.h in Headers */,
+				8C6EA61A11EF7E0400FD8EE3 /* RuntimeEnabledFeatures.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -22217,6 +22224,7 @@
 				93F19B0508245E59001E9ABC /* XSLTProcessorLibxslt.cpp in Sources */,
 				E1BE512D0CF6C512002EA959 /* XSLTUnicodeSort.cpp in Sources */,
 				97DD4D860FDF4D6E00ECF9A4 /* XSSAuditor.cpp in Sources */,
+				8C6EA61911EF7E0400FD8EE3 /* RuntimeEnabledFeatures.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/WebCore/websockets/WebSocket.cpp b/WebCore/websockets/WebSocket.cpp
index 91761fb..38629d7 100644
--- a/WebCore/websockets/WebSocket.cpp
+++ b/WebCore/websockets/WebSocket.cpp
@@ -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)
diff --git a/WebCore/websockets/WebSocket.h b/WebCore/websockets/WebSocket.h
index b2102d1..2c95ff9 100644
--- a/WebCore/websockets/WebSocket.h
+++ b/WebCore/websockets/WebSocket.h
@@ -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();
 

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list