[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[steveblock at google.com]

The following commit has been merged in the webkit-1.1 branch:
commit e028a397b0a0d9c244a2f808aca217c53c1a944e
Author: steveblock at google.com <steveblock at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 11 13:29:36 2010 +0000

    2010-02-11  Steve Block  <steveblock at google.com>
    
            Reviewed by Jeremy Orlow.
    
            Updates Android V8 Makefile to generate Notifications and WebSockets headers required by V8DOMWrapper.cpp
            https://bugs.webkit.org/show_bug.cgi?id=34815
    
            No new tests, build fix only.
    
            * Android.derived.v8bindings.mk:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54653 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk
index 346c0fa..303f824 100644
--- a/WebCore/Android.derived.v8bindings.mk
+++ b/WebCore/Android.derived.v8bindings.mk
@@ -547,6 +547,36 @@ LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
 # above rules.  Specifying this explicitly makes -j2 work.
 $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)/bindings/%.h
 
+# Notifications
+# These headers are required by the V8 bindings even when Notifications are disabled
+GEN := \
+    $(intermediates)/bindings/V8Notification.h
+
+$(GEN): PRIVATE_PATH := $(LOCAL_PATH)
+$(GEN): PRIVATE_CUSTOM_TOOL = SOURCE_ROOT=$(PRIVATE_PATH) perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator V8 --include dom --include html --outputdir $(dir $@) $<
+$(GEN): $(intermediates)/bindings/V8%.h : $(LOCAL_PATH)/notifications/%.idl $(js_binding_scripts)
+	$(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
+
+# We also need the .cpp files, which are generated as side effects of the
+# above rules.  Specifying this explicitly makes -j2 work.
+$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)/bindings/%.h
+
+# Web Sockets
+# These headers are required by the V8 bindings even when Web Sockets are disabled
+GEN := \
+    $(intermediates)/bindings/V8WebSocket.h
+
+$(GEN): PRIVATE_PATH := $(LOCAL_PATH)
+$(GEN): PRIVATE_CUSTOM_TOOL = SOURCE_ROOT=$(PRIVATE_PATH) perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator V8 --include dom --include html --outputdir $(dir $@) $<
+$(GEN): $(intermediates)/bindings/V8%.h : $(LOCAL_PATH)/websockets/%.idl $(js_binding_scripts)
+	$(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
+
+# We also need the .cpp files, which are generated as side effects of the
+# above rules.  Specifying this explicitly makes -j2 work.
+$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)/bindings/%.h
+
 # HTML tag and attribute names
 GEN:= $(intermediates)/HTMLNames.cpp $(intermediates)/HTMLElementFactory.cpp
 $(GEN): PRIVATE_PATH := $(LOCAL_PATH)
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ab8ab17..2a00ca1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,17 @@
 
         Reviewed by Jeremy Orlow.
 
+        Updates Android V8 Makefile to generate Notifications and WebSockets headers required by V8DOMWrapper.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=34815
+
+        No new tests, build fix only.
+
+        * Android.derived.v8bindings.mk:
+
+2010-02-11  Steve Block  <steveblock at google.com>
+
+        Reviewed by Jeremy Orlow.
+
         Updates Android V8 Makefile to generate XPath header required by V8Proxy.cpp
         https://bugs.webkit.org/show_bug.cgi?id=34814
 

-- 
WebKit Debian packaging