[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756
steveblock at google.com
steveblock at google.com
Fri Feb 26 22:17:38 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit f7bf18192430852b390adcb1d2b0dc4f7a5a960b
Author: steveblock at google.com <steveblock at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Feb 11 11:27:20 2010 +0000
Guards SVG code in V8 bindings with ENABLE(SVG)
https://bugs.webkit.org/show_bug.cgi?id=34812
Also updates Android V8 Makefile to generate required SVG headers.
No new tests, build fix only.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54650 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk
index a3a9673..2903168 100644
--- a/WebCore/Android.derived.v8bindings.mk
+++ b/WebCore/Android.derived.v8bindings.mk
@@ -68,7 +68,6 @@ $(GEN): $(intermediates)/bindings/V8%.h : $(LOCAL_PATH)/css/%.idl $(js_binding_s
$(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
@@ -256,7 +255,7 @@ 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
-# page
+# Page
GEN := \
$(intermediates)/bindings/V8BarInfo.h \
$(intermediates)/bindings/V8Console.h \
@@ -332,24 +331,30 @@ LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)/bindings/%.h
# SVG
-ifeq ($(ENABLE_SVG), true)
+# These headers are required by the V8 bindings even when SVG is disabled
GEN := \
+ $(intermediates)/bindings/V8SVGColor.h \
+ $(intermediates)/bindings/V8SVGDocument.h \
+ $(intermediates)/bindings/V8SVGElement.h \
+ $(intermediates)/bindings/V8SVGElementInstance.h \
+ $(intermediates)/bindings/V8SVGException.h \
+ $(intermediates)/bindings/V8SVGPaint.h \
+ $(intermediates)/bindings/V8SVGZoomEvent.h
+
+ifeq ($(ENABLE_SVG), true)
+GEN += \
$(intermediates)/bindings/V8SVGAElement.h \
$(intermediates)/bindings/V8SVGAltGlyphElement.h \
$(intermediates)/bindings/V8SVGAngle.h \
$(intermediates)/bindings/V8SVGCircleElement.h \
$(intermediates)/bindings/V8SVGClipPathElement.h \
- $(intermediates)/bindings/V8SVGColor.h \
$(intermediates)/bindings/V8SVGComponentTransferFunctionElement.h \
$(intermediates)/bindings/V8SVGCursorElement.h \
$(intermediates)/bindings/V8SVGDefsElement.h \
$(intermediates)/bindings/V8SVGDescElement.h \
- $(intermediates)/bindings/V8SVGDocument.h \
$(intermediates)/bindings/V8SVGElement.h \
- $(intermediates)/bindings/V8SVGElementInstance.h \
$(intermediates)/bindings/V8SVGElementInstanceList.h \
$(intermediates)/bindings/V8SVGEllipseElement.h \
- $(intermediates)/bindings/V8SVGException.h \
$(intermediates)/bindings/V8SVGFEBlendElement.h \
$(intermediates)/bindings/V8SVGFEColorMatrixElement.h \
$(intermediates)/bindings/V8SVGFEComponentTransferElement.h \
@@ -396,7 +401,6 @@ GEN := \
$(intermediates)/bindings/V8SVGMissingGlyphElement.h \
$(intermediates)/bindings/V8SVGNumber.h \
$(intermediates)/bindings/V8SVGNumberList.h \
- $(intermediates)/bindings/V8SVGPaint.h \
$(intermediates)/bindings/V8SVGPathElement.h \
$(intermediates)/bindings/V8SVGPathSeg.h \
$(intermediates)/bindings/V8SVGPathSegArcAbs.h \
@@ -449,7 +453,6 @@ GEN := \
$(intermediates)/bindings/V8SVGUnitTypes.h \
$(intermediates)/bindings/V8SVGUseElement.h \
$(intermediates)/bindings/V8SVGViewElement.h \
- $(intermediates)/bindings/V8SVGZoomEvent.h \
\
$(intermediates)/bindings/V8SVGAnimatedAngle.h \
$(intermediates)/bindings/V8SVGAnimatedEnumeration.h \
@@ -464,6 +467,7 @@ GEN := \
$(intermediates)/bindings/V8SVGAnimatedRect.h \
$(intermediates)/bindings/V8SVGAnimatedString.h \
$(intermediates)/bindings/V8SVGAnimatedTransformList.h
+endif
ifeq ($(ENABLE_SVG_ANIMATION), true)
GEN += \
@@ -483,7 +487,6 @@ 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
-endif
# Workers
GEN := \
@@ -527,7 +530,6 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)
#end
# HTML tag and attribute names
-
GEN:= $(intermediates)/HTMLNames.cpp $(intermediates)/HTMLElementFactory.cpp
$(GEN): PRIVATE_PATH := $(LOCAL_PATH)
$(GEN): PRIVATE_CUSTOM_TOOL = perl -I $(PRIVATE_PATH)/bindings/scripts $< --tags $(PRIVATE_PATH)/html/HTMLTagNames.in --attrs $(PRIVATE_PATH)/html/HTMLAttributeNames.in --factory --wrapperFactory --output $(dir $@)
@@ -536,7 +538,6 @@ $(GEN): $(LOCAL_PATH)/dom/make_names.pl $(LOCAL_PATH)/html/HTMLTagNames.in $(LOC
LOCAL_GENERATED_SOURCES += $(GEN)
# SVG tag and attribute names
-
ifeq ($(ENABLE_SVG), true)
GEN:= $(intermediates)/SVGNames.cpp $(intermediates)/SVGElementFactory.cpp
SVG_FLAGS:=ENABLE_SVG_AS_IMAGE=1 ENABLE_SVG_FILTERS=1 ENABLE_SVG_FONTS=1 ENABLE_SVG_FOREIGN_OBJECT=1 ENABLE_SVG_USE=1
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3a1016c..784085e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-02-11 Steve Block <steveblock at google.com>
+
+ Reviewed by David Levin.
+
+ Guards SVG code in V8 bindings with ENABLE(SVG)
+ https://bugs.webkit.org/show_bug.cgi?id=34812
+
+ Also updates Android V8 Makefile to generate required SVG headers.
+
+ No new tests, build fix only.
+
+ * Android.derived.v8bindings.mk:
+ * bindings/v8/custom/V8CSSValueCustom.cpp:
+ (WebCore::toV8):
+ * bindings/v8/custom/V8DocumentCustom.cpp:
+ (WebCore::toV8):
+ * bindings/v8/custom/V8ElementCustom.cpp:
+ (WebCore::toV8):
+
2010-02-08 Maciej Stachowiak <mjs at apple.com>
Reviewed by Cameron Zwarich.
diff --git a/WebCore/bindings/v8/custom/V8CSSValueCustom.cpp b/WebCore/bindings/v8/custom/V8CSSValueCustom.cpp
index 9e692ad..b06bc3c 100644
--- a/WebCore/bindings/v8/custom/V8CSSValueCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8CSSValueCustom.cpp
@@ -49,10 +49,12 @@ v8::Handle<v8::Value> toV8(CSSValue* impl)
return toV8(static_cast<CSSValueList*>(impl));
if (impl->isPrimitiveValue())
return toV8(static_cast<CSSPrimitiveValue*>(impl));
+#if ENABLE(SVG)
if (impl->isSVGPaint())
return toV8(static_cast<SVGPaint*>(impl));
if (impl->isSVGColor())
return toV8(static_cast<SVGColor*>(impl));
+#endif
return V8CSSValue::wrap(impl);
}
diff --git a/WebCore/bindings/v8/custom/V8DocumentCustom.cpp b/WebCore/bindings/v8/custom/V8DocumentCustom.cpp
index 9a086cc..81b7aeb 100644
--- a/WebCore/bindings/v8/custom/V8DocumentCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8DocumentCustom.cpp
@@ -142,8 +142,10 @@ v8::Handle<v8::Value> toV8(Document* impl, bool forceNewObject)
return v8::Null();
if (impl->isHTMLDocument())
return toV8(static_cast<HTMLDocument*>(impl), forceNewObject);
+#if ENABLE(SVG)
if (impl->isSVGDocument())
return toV8(static_cast<SVGDocument*>(impl), forceNewObject);
+#endif
v8::Handle<v8::Value> wrapper = V8Document::wrap(impl, forceNewObject);
if (wrapper.IsEmpty())
return wrapper;
diff --git a/WebCore/bindings/v8/custom/V8ElementCustom.cpp b/WebCore/bindings/v8/custom/V8ElementCustom.cpp
index 8fa8339..86f134e 100644
--- a/WebCore/bindings/v8/custom/V8ElementCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8ElementCustom.cpp
@@ -122,8 +122,10 @@ v8::Handle<v8::Value> toV8(Element* impl, bool forceNewObject)
return v8::Null();
if (impl->isHTMLElement())
return toV8(static_cast<HTMLElement*>(impl), forceNewObject);
+#if ENABLE(SVG)
if (impl->isSVGElement())
return toV8(static_cast<SVGElement*>(impl), forceNewObject);
+#endif
return V8Element::wrap(impl, forceNewObject);
}
} // namespace WebCore
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list