[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 f20295b52b36f94497e8fdc9dc1bcac53b21632f
Author: steveblock at google.com <steveblock at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 11 11:40:45 2010 +0000

    Update Android V8 Makefile to generate Inspector headers required by V8 ScriptObject.cpp
    https://bugs.webkit.org/show_bug.cgi?id=34806
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54651 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk
index 2903168..fa89e95 100644
--- a/WebCore/Android.derived.v8bindings.mk
+++ b/WebCore/Android.derived.v8bindings.mk
@@ -529,6 +529,23 @@ LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
 $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)/bindings/%.h
 #end
 
+# Inspector
+# These headers are required by the V8 bindings even when Inspector is disabled
+GEN := \
+    $(intermediates)/bindings/V8InjectedScriptHost.h \
+    $(intermediates)/bindings/V8InspectorBackend.h \
+    $(intermediates)/bindings/V8InspectorFrontendHost.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)/inspector/%.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 784085e..d7fc22b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,16 @@
 2010-02-11  Steve Block  <steveblock at google.com>
 
+        Reviewed by Nate Chapin.
+
+        Update Android V8 Makefile to generate Inspector headers required by V8 ScriptObject.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=34806
+
+        No new tests, build fix only.
+
+        * Android.derived.v8bindings.mk:
+
+2010-02-11  Steve Block  <steveblock at google.com>
+
         Reviewed by David Levin.
 
         Guards SVG code in V8 bindings with ENABLE(SVG)

-- 
WebKit Debian packaging