[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
ddkilzer at apple.com
ddkilzer at apple.com
Thu Oct 29 20:34:47 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 881bafc01e8fc5b1a982454376f915933e6a785a
Author: ddkilzer at apple.com <ddkilzer at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Sep 27 03:02:24 2009 +0000
Part 2 of 2: <http://webkit.org/b/29753> DerivedSources.make broken for non-Mac targets
Reviewed by Darin Adler.
Fix ENABLE_ORIENTATION_EVENTS for non-Mac platforms.
WebCore:
* DerivedSources.make: Moved Platform.h check for
ENABLE_ORIENTATION_EVENTS into Mac-only section and added
default of ENABLE_ORIENTATION_EVENTS = 0 to non-Mac section.
Added ifndef test to make it possible to override both
ENABLE_DASHBOARD_SUPPORT and ENABLE_ORIENTATION_EVENTS external
to the makefile. Moved addition of ENABLE_ORIENTATION_EVENTS to
ADDITIONAL_IDL_DEFINES to common section.
* GNUmakefile.am: Added support for ENABLE_ORIENTATION_EVENTS if
it is ever used.
* WebCore.pro: Ditto.
WebKit:
* chromium/features.gypi: Added 'ENABLE_ORIENTATION_EVENTS=0' to
disable this feature by default.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48795 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 81fdb8f..5af0a34 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2009-09-26 David Kilzer <ddkilzer at apple.com>
+
+ Part 2 of 2: <http://webkit.org/b/29753> DerivedSources.make broken for non-Mac targets
+
+ Reviewed by Darin Adler.
+
+ Fix ENABLE_ORIENTATION_EVENTS for non-Mac platforms.
+
+ * DerivedSources.make: Moved Platform.h check for
+ ENABLE_ORIENTATION_EVENTS into Mac-only section and added
+ default of ENABLE_ORIENTATION_EVENTS = 0 to non-Mac section.
+ Added ifndef test to make it possible to override both
+ ENABLE_DASHBOARD_SUPPORT and ENABLE_ORIENTATION_EVENTS external
+ to the makefile. Moved addition of ENABLE_ORIENTATION_EVENTS to
+ ADDITIONAL_IDL_DEFINES to common section.
+ * GNUmakefile.am: Added support for ENABLE_ORIENTATION_EVENTS if
+ it is ever used.
+ * WebCore.pro: Ditto.
+
2009-09-26 Kent Tamura <tkent at chromium.org>
Reviewed by David Kilzer.
diff --git a/WebCore/DerivedSources.make b/WebCore/DerivedSources.make
index 9a52db8..e77501f 100644
--- a/WebCore/DerivedSources.make
+++ b/WebCore/DerivedSources.make
@@ -461,19 +461,30 @@ else
ENABLE_DASHBOARD_SUPPORT = 0
endif
+ifeq ($(shell gcc -E -P -dM $(FRAMEWORK_FLAGS) WebCore/ForwardingHeaders/wtf/Platform.h | grep ENABLE_ORIENTATION_EVENTS | cut -d' ' -f3), 1)
+ ENABLE_ORIENTATION_EVENTS = 1
else
+ ENABLE_ORIENTATION_EVENTS = 0
+endif
-ENABLE_DASHBOARD_SUPPORT = 0
+else
+ifndef ENABLE_DASHBOARD_SUPPORT
+ ENABLE_DASHBOARD_SUPPORT = 0
endif
-ifeq ($(shell gcc -E -P -dM $(FRAMEWORK_FLAGS) WebCore/ForwardingHeaders/wtf/Platform.h | grep ENABLE_ORIENTATION_EVENTS | cut -d' ' -f3), 1)
- ENABLE_ORIENTATION_EVENTS = 1
- ADDITIONAL_IDL_DEFINES := $(ADDITIONAL_IDL_DEFINES) ENABLE_ORIENTATION_EVENTS
-else
+ifndef ENABLE_ORIENTATION_EVENTS
ENABLE_ORIENTATION_EVENTS = 0
endif
+endif # MACOS
+
+ifeq ($(ENABLE_ORIENTATION_EVENTS), 1)
+ ADDITIONAL_IDL_DEFINES := $(ADDITIONAL_IDL_DEFINES) ENABLE_ORIENTATION_EVENTS
+endif
+
+# --------
+
# CSS property names and value keywords
WEBCORE_CSS_PROPERTY_NAMES := $(WebCore)/css/CSSPropertyNames.in
@@ -841,6 +852,6 @@ DOM%.h : %.idl $(GENERATE_BINDINGS_SCRIPTS) bindings/scripts/CodeGeneratorObjC.p
# --------
-endif
+endif # MACOS
# ------------------------
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index ee3a0d4..715e23c 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -2262,6 +2262,17 @@ webcore_cppflags += -DENABLE_ICONDATABASE=0
endif # END ENABLE_ICONDATABASE
# ----
+# Orientation Events
+# ----
+if ENABLE_ORIENTATION_EVENTS
+
+FEATURE_DEFINES_JAVASCRIPT += ENABLE_ORIENTATION_EVENTS=1
+
+webcore_cppflags += -DENABLE_ORIENTATION_EVENTS=1
+
+endif # END ENABLE_ORIENTATION_EVENTS
+
+# ----
# Video Support
# ----
if ENABLE_VIDEO
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index c16c6d1..ff92afe 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -113,6 +113,7 @@ contains(DEFINES, ENABLE_SINGLE_THREADED=1) {
!contains(DEFINES, ENABLE_DOM_STORAGE=.): DEFINES += ENABLE_DOM_STORAGE=1
!contains(DEFINES, ENABLE_ICONDATABASE=.): DEFINES += ENABLE_ICONDATABASE=1
!contains(DEFINES, ENABLE_CHANNEL_MESSAGING=.): DEFINES += ENABLE_CHANNEL_MESSAGING=1
+!contains(DEFINES, ENABLE_ORIENTATION_EVENTS=.): DEFINES += ENABLE_ORIENTATION_EVENTS=0
# turn on SQLITE support if any of the dependent features are turned on
!contains(DEFINES, ENABLE_SQLITE=.) {
@@ -2486,6 +2487,10 @@ contains(DEFINES, ENABLE_CHANNEL_MESSAGING=1) {
FEATURE_DEFINES_JAVASCRIPT += ENABLE_CHANNEL_MESSAGING=1
}
+contains(DEFINES, ENABLE_ORIENTATION_EVENTS=1) {
+ FEATURE_DEFINES_JAVASCRIPT += ENABLE_ORIENTATION_EVENTS=1
+}
+
contains(DEFINES, ENABLE_DASHBOARD_SUPPORT=0) {
DASHBOARDSUPPORTCSSPROPERTIES -= $$PWD/css/DashboardSupportCSSPropertyNames.in
}
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index b317193..7d55d82 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2009-09-26 David Kilzer <ddkilzer at apple.com>
+
+ Part 2 of 2: <http://webkit.org/b/29753> DerivedSources.make broken for non-Mac targets
+
+ Reviewed by Darin Adler.
+
+ Fix ENABLE_ORIENTATION_EVENTS for non-Mac platforms.
+
+ * chromium/features.gypi: Added 'ENABLE_ORIENTATION_EVENTS=0' to
+ disable this feature by default.
+
2009-09-22 Yaar Schnitman <yaar at chromium.org>
Reviewed by David Levin.
diff --git a/WebKit/chromium/features.gypi b/WebKit/chromium/features.gypi
index cf5420f..adcb527 100644
--- a/WebKit/chromium/features.gypi
+++ b/WebKit/chromium/features.gypi
@@ -43,6 +43,7 @@
'ENABLE_JSC_MULTIPLE_THREADS=0',
'ENABLE_ICONDATABASE=0',
'ENABLE_NOTIFICATIONS=0',
+ 'ENABLE_ORIENTATION_EVENTS=0',
'ENABLE_XSLT=1',
'ENABLE_XPATH=1',
'ENABLE_SHARED_WORKERS=0',
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list