[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Thu Apr 8 01:58:43 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit d2abb71720462abd9d30b73fa14e7b57e02406f3
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Feb 25 04:43:21 2010 +0000
2010-02-24 Dominic Mazzoni <dmazzoni at chromium.org>
Reviewed by Jeremy Orlow.
Wraps includes of SVG headers so that it's possible to
compile the V8 bindings with SVG disabled, e.g. 'enable_svg=0'.
https://bugs.webkit.org/show_bug.cgi?id=35345
No new tests.
* bindings/v8/V8DOMWrapper.cpp:
* bindings/v8/V8Proxy.cpp:
* bindings/v8/custom/V8CSSValueCustom.cpp:
* bindings/v8/custom/V8DocumentCustom.cpp:
* bindings/v8/custom/V8ElementCustom.cpp:
* bindings/v8/custom/V8EventCustom.cpp:
* bindings/v8/custom/V8SVGElementCustom.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55217 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c54556d..f6350b0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2010-02-24 Dominic Mazzoni <dmazzoni at chromium.org>
+
+ Reviewed by Jeremy Orlow.
+
+ Wraps includes of SVG headers so that it's possible to
+ compile the V8 bindings with SVG disabled, e.g. 'enable_svg=0'.
+ https://bugs.webkit.org/show_bug.cgi?id=35345
+
+ No new tests.
+
+ * bindings/v8/V8DOMWrapper.cpp:
+ * bindings/v8/V8Proxy.cpp:
+ * bindings/v8/custom/V8CSSValueCustom.cpp:
+ * bindings/v8/custom/V8DocumentCustom.cpp:
+ * bindings/v8/custom/V8ElementCustom.cpp:
+ * bindings/v8/custom/V8EventCustom.cpp:
+ * bindings/v8/custom/V8SVGElementCustom.cpp:
+
2010-02-24 Maciej Stachowiak <mjs at apple.com>
Unreviewed build fix.
diff --git a/WebCore/bindings/v8/V8DOMWrapper.cpp b/WebCore/bindings/v8/V8DOMWrapper.cpp
index 6225b62..48cbd45 100644
--- a/WebCore/bindings/v8/V8DOMWrapper.cpp
+++ b/WebCore/bindings/v8/V8DOMWrapper.cpp
@@ -37,8 +37,6 @@
#include "DocumentLoader.h"
#include "FrameLoaderClient.h"
#include "Notification.h"
-#include "SVGElementInstance.h"
-#include "SVGPathSeg.h"
#include "ScriptController.h"
#include "V8AbstractEventListener.h"
#include "V8Binding.h"
@@ -59,7 +57,6 @@
#include "V8NodeList.h"
#include "V8Notification.h"
#include "V8Proxy.h"
-#include "V8SVGElementInstance.h"
#include "V8SharedWorker.h"
#include "V8SharedWorkerContext.h"
#include "V8StyleSheet.h"
@@ -73,6 +70,12 @@
#include "WebGLUniformLocation.h"
#include "WorkerContextExecutionProxy.h"
+#if ENABLE(SVG)
+#include "SVGElementInstance.h"
+#include "SVGPathSeg.h"
+#include "V8SVGElementInstance.h"
+#endif
+
#include <algorithm>
#include <utility>
#include <v8.h>
diff --git a/WebCore/bindings/v8/V8Proxy.cpp b/WebCore/bindings/v8/V8Proxy.cpp
index 7ede064..fade001 100644
--- a/WebCore/bindings/v8/V8Proxy.cpp
+++ b/WebCore/bindings/v8/V8Proxy.cpp
@@ -54,11 +54,14 @@
#include "V8Index.h"
#include "V8IsolatedContext.h"
#include "V8RangeException.h"
-#include "V8SVGException.h"
#include "V8XMLHttpRequestException.h"
#include "V8XPathException.h"
#include "WorkerContextExecutionProxy.h"
+#if ENABLE(SVG)
+#include "V8SVGException.h"
+#endif
+
#include <algorithm>
#include <stdio.h>
#include <utility>
diff --git a/WebCore/bindings/v8/custom/V8CSSValueCustom.cpp b/WebCore/bindings/v8/custom/V8CSSValueCustom.cpp
index b06bc3c..601a62a 100644
--- a/WebCore/bindings/v8/custom/V8CSSValueCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8CSSValueCustom.cpp
@@ -33,9 +33,12 @@
#include "V8CSSPrimitiveValue.h"
#include "V8CSSValueList.h"
+#include "V8WebKitCSSTransformValue.h"
+
+#if ENABLE(SVG)
#include "V8SVGColor.h"
#include "V8SVGPaint.h"
-#include "V8WebKitCSSTransformValue.h"
+#endif
namespace WebCore {
diff --git a/WebCore/bindings/v8/custom/V8DocumentCustom.cpp b/WebCore/bindings/v8/custom/V8DocumentCustom.cpp
index 8968707..a5371ca 100644
--- a/WebCore/bindings/v8/custom/V8DocumentCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8DocumentCustom.cpp
@@ -46,11 +46,14 @@
#include "V8IsolatedContext.h"
#include "V8Node.h"
#include "V8Proxy.h"
-#include "V8SVGDocument.h"
#include "V8WebGLRenderingContext.h"
#include "V8XPathNSResolver.h"
#include "V8XPathResult.h"
+#if ENABLE(SVG)
+#include "V8SVGDocument.h"
+#endif
+
#include <wtf/RefPtr.h>
namespace WebCore {
diff --git a/WebCore/bindings/v8/custom/V8ElementCustom.cpp b/WebCore/bindings/v8/custom/V8ElementCustom.cpp
index 86f134e..8256110 100644
--- a/WebCore/bindings/v8/custom/V8ElementCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8ElementCustom.cpp
@@ -45,7 +45,10 @@
#include "V8BindingState.h"
#include "V8HTMLElement.h"
#include "V8Proxy.h"
+
+#if ENABLE(SVG)
#include "V8SVGElement.h"
+#endif
#include <wtf/RefPtr.h>
diff --git a/WebCore/bindings/v8/custom/V8EventCustom.cpp b/WebCore/bindings/v8/custom/V8EventCustom.cpp
index 79bddc0..66983ff 100644
--- a/WebCore/bindings/v8/custom/V8EventCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8EventCustom.cpp
@@ -48,7 +48,6 @@
#include "V8PopStateEvent.h"
#include "V8ProgressEvent.h"
#include "V8Proxy.h"
-#include "V8SVGZoomEvent.h"
#include "V8StorageEvent.h"
#include "V8TextEvent.h"
#include "V8TouchEvent.h"
@@ -58,6 +57,10 @@
#include "V8WheelEvent.h"
#include "V8XMLHttpRequestProgressEvent.h"
+#if ENABLE(SVG)
+#include "V8SVGZoomEvent.h"
+#endif
+
namespace WebCore {
void V8Event::valueAccessorSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
diff --git a/WebCore/bindings/v8/custom/V8SVGElementCustom.cpp b/WebCore/bindings/v8/custom/V8SVGElementCustom.cpp
index 0ce48ce..7ad5f41 100644
--- a/WebCore/bindings/v8/custom/V8SVGElementCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8SVGElementCustom.cpp
@@ -29,10 +29,10 @@
*/
#include "config.h"
-#include "V8SVGElement.h"
#if ENABLE(SVG)
+#include "V8SVGElement.h"
#include "V8SVGElementWrapperFactory.h"
namespace WebCore {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list