- Revision
- 149759
- Author
- [email protected]
- Date
- 2013-05-08 12:39:49 -0700 (Wed, 08 May 2013)
Log Message
[GTK] Plumb the Automake build system for the Battery Status API feature
https://bugs.webkit.org/show_bug.cgi?id=115718
Reviewed by Martin Robinson.
.:
* Source/autotools/FindDependencies.m4: Check for the upower-glib dependency if the feature is enabled.
* Source/autotools/PrintBuildConfiguration.m4: Print out the feature status.
* Source/autotools/ReadCommandLineArguments.m4: Check for the --enable-battery-status option. The deafult,
when the option is not given, is to disable the feature.
* Source/autotools/SetupWebKitFeatures.m4: Treat the ENABLE_BATTERY_STATUS define as configurable.
* Source/autotools/symbols.filter: Export a couple of symbols that are used in the WebCore internals library.
Source/WebCore:
No new tests - no new functionality. The feature is not enabled yet, though all the relevant tests
pass when it is.
* GNUmakefile.am: Add the Modules/battery directory to the list of search paths for header inclusions.
Include the same directory under the IDL_PATH variable so the IDL files it contains are processed.
List these IDL files using a wildcard under the EXTRA_DIST list.
* GNUmakefile.list.am: Add the build targets for the module source files, IDLs and resulting JS bindings.
* bindings/gobject/GNUmakefile.am: Add the build targets for the GObject DOM bindings.
Tools:
* Scripts/webkitdirs.pm:
(buildAutotoolsProject): List battery-status as a configurable feature, meaning its value will be adjusted
through the --(enable|disable)-battery-status flag passed to configure.
Modified Paths
Diff
Modified: trunk/ChangeLog (149758 => 149759)
--- trunk/ChangeLog 2013-05-08 19:28:24 UTC (rev 149758)
+++ trunk/ChangeLog 2013-05-08 19:39:49 UTC (rev 149759)
@@ -1,3 +1,17 @@
+2013-05-08 José Dapena Paz <[email protected]> and Zan Dobersek <[email protected]>
+
+ [GTK] Plumb the Automake build system for the Battery Status API feature
+ https://bugs.webkit.org/show_bug.cgi?id=115718
+
+ Reviewed by Martin Robinson.
+
+ * Source/autotools/FindDependencies.m4: Check for the upower-glib dependency if the feature is enabled.
+ * Source/autotools/PrintBuildConfiguration.m4: Print out the feature status.
+ * Source/autotools/ReadCommandLineArguments.m4: Check for the --enable-battery-status option. The deafult,
+ when the option is not given, is to disable the feature.
+ * Source/autotools/SetupWebKitFeatures.m4: Treat the ENABLE_BATTERY_STATUS define as configurable.
+ * Source/autotools/symbols.filter: Export a couple of symbols that are used in the WebCore internals library.
+
2013-05-08 Zan Dobersek <[email protected]>
[Automake] Pass --no-demangle to the linker by default to get the mangled symbols
Modified: trunk/Source/WebCore/ChangeLog (149758 => 149759)
--- trunk/Source/WebCore/ChangeLog 2013-05-08 19:28:24 UTC (rev 149758)
+++ trunk/Source/WebCore/ChangeLog 2013-05-08 19:39:49 UTC (rev 149759)
@@ -1,3 +1,19 @@
+2013-05-08 José Dapena Paz <[email protected]> and Zan Dobersek <[email protected]>
+
+ [GTK] Plumb the Automake build system for the Battery Status API feature
+ https://bugs.webkit.org/show_bug.cgi?id=115718
+
+ Reviewed by Martin Robinson.
+
+ No new tests - no new functionality. The feature is not enabled yet, though all the relevant tests
+ pass when it is.
+
+ * GNUmakefile.am: Add the Modules/battery directory to the list of search paths for header inclusions.
+ Include the same directory under the IDL_PATH variable so the IDL files it contains are processed.
+ List these IDL files using a wildcard under the EXTRA_DIST list.
+ * GNUmakefile.list.am: Add the build targets for the module source files, IDLs and resulting JS bindings.
+ * bindings/gobject/GNUmakefile.am: Add the build targets for the GObject DOM bindings.
+
2013-05-08 Roger Fong <[email protected]>
Unreviewed. AppleWin VS2010 build fix.
Modified: trunk/Source/WebCore/GNUmakefile.am (149758 => 149759)
--- trunk/Source/WebCore/GNUmakefile.am 2013-05-08 19:28:24 UTC (rev 149758)
+++ trunk/Source/WebCore/GNUmakefile.am 2013-05-08 19:39:49 UTC (rev 149759)
@@ -9,6 +9,7 @@
-I$(srcdir)/Source/ThirdParty/ANGLE/include/GLSLANG \
-I$(srcdir)/Source/ThirdParty/ANGLE/include/KHR \
-I$(srcdir)/Source/WebCore \
+ -I$(srcdir)/Source/WebCore/Modules/battery \
-I$(srcdir)/Source/WebCore/Modules/filesystem \
-I$(srcdir)/Source/WebCore/Modules/gamepad \
-I$(srcdir)/Source/WebCore/Modules/geolocation \
@@ -372,6 +373,7 @@
DerivedSources/ANGLE/glslang_tab.h: DerivedSources/ANGLE/glslang_tab.cpp
IDL_PATH := \
+ $(WebCore)/Modules/battery \
$(WebCore)/Modules/filesystem \
$(WebCore)/Modules/gamepad \
$(WebCore)/Modules/geolocation \
@@ -601,6 +603,7 @@
$(XT_CFLAGS)
EXTRA_DIST += \
+ $(wildcard $(srcdir)/Source/WebCore/Modules/battery/*.idl) \
$(wildcard $(srcdir)/Source/WebCore/Modules/filesystem/*.idl) \
$(wildcard $(srcdir)/Source/WebCore/Modules/gamepad/*.idl) \
$(wildcard $(srcdir)/Source/WebCore/Modules/geolocation/*.idl) \
Modified: trunk/Source/WebCore/GNUmakefile.list.am (149758 => 149759)
--- trunk/Source/WebCore/GNUmakefile.list.am 2013-05-08 19:28:24 UTC (rev 149758)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2013-05-08 19:39:49 UTC (rev 149759)
@@ -71,6 +71,8 @@
DerivedSources/WebCore/JSAudioTrackList.h \
DerivedSources/WebCore/JSBarInfo.cpp \
DerivedSources/WebCore/JSBarInfo.h \
+ DerivedSources/WebCore/JSBatteryManager.cpp \
+ DerivedSources/WebCore/JSBatteryManager.h \
DerivedSources/WebCore/JSBeforeLoadEvent.cpp \
DerivedSources/WebCore/JSBeforeLoadEvent.h \
DerivedSources/WebCore/JSBiquadFilterNode.cpp \
@@ -1214,6 +1216,8 @@
DerivedSources/WebCore/JSSVGZoomEvent.h
dom_binding_idls += \
+ $(WebCore)/Modules/battery/BatteryManager.idl \
+ $(WebCore)/Modules/battery/NavigatorBattery.idl \
$(WebCore)/Modules/filesystem/DOMFileSystem.idl \
$(WebCore)/Modules/filesystem/DOMFileSystemSync.idl \
$(WebCore)/Modules/filesystem/DOMWindowFileSystem.idl \
@@ -1814,6 +1818,15 @@
$(WebCore)/xml/XSLTProcessor.idl
webcore_modules_sources += \
+ Source/WebCore/Modules/battery/BatteryClient.h \
+ Source/WebCore/Modules/battery/BatteryController.cpp \
+ Source/WebCore/Modules/battery/BatteryController.h \
+ Source/WebCore/Modules/battery/BatteryManager.cpp \
+ Source/WebCore/Modules/battery/BatteryManager.h \
+ Source/WebCore/Modules/battery/BatteryStatus.cpp \
+ Source/WebCore/Modules/battery/BatteryStatus.h \
+ Source/WebCore/Modules/battery/NavigatorBattery.cpp \
+ Source/WebCore/Modules/battery/NavigatorBattery.h \
Source/WebCore/Modules/filesystem/AsyncFileWriter.h \
Source/WebCore/Modules/filesystem/AsyncFileWriterClient.h \
Source/WebCore/Modules/filesystem/DOMFilePath.cpp \
Modified: trunk/Source/WebCore/bindings/gobject/GNUmakefile.am (149758 => 149759)
--- trunk/Source/WebCore/bindings/gobject/GNUmakefile.am 2013-05-08 19:28:24 UTC (rev 149758)
+++ trunk/Source/WebCore/bindings/gobject/GNUmakefile.am 2013-05-08 19:39:49 UTC (rev 149759)
@@ -3,6 +3,8 @@
DerivedSources/webkitdom/WebKitDOMAttrPrivate.h \
DerivedSources/webkitdom/WebKitDOMBarInfo.cpp \
DerivedSources/webkitdom/WebKitDOMBarInfoPrivate.h \
+ DerivedSources/webkitdom/WebKitDOMBatteryManager.cpp \
+ DerivedSources/webkitdom/WebKitDOMBatteryManagerPrivate.h \
DerivedSources/webkitdom/WebKitDOMBlob.cpp \
DerivedSources/webkitdom/WebKitDOMBlobPrivate.h \
DerivedSources/webkitdom/WebKitDOMCDATASection.cpp \
@@ -283,6 +285,7 @@
DerivedSources/webkitdom/WebKitDOMXPathResultPrivate.h
webkitgtk_gdom_built_h_api += \
+ DerivedSources/webkitdom/WebKitDOMBatteryManager.h \
DerivedSources/webkitdom/WebKitDOMCSSRule.h \
DerivedSources/webkitdom/WebKitDOMCSSRuleList.h \
DerivedSources/webkitdom/WebKitDOMCSSStyleDeclaration.h \
Modified: trunk/Source/autotools/FindDependencies.m4 (149758 => 149759)
--- trunk/Source/autotools/FindDependencies.m4 2013-05-08 19:28:24 UTC (rev 149758)
+++ trunk/Source/autotools/FindDependencies.m4 2013-05-08 19:39:49 UTC (rev 149759)
@@ -488,6 +488,13 @@
AC_SUBST(GAMEPAD_LIBS)
fi
+if test "$enable_battery_status" = "yes"; then
+ PKG_CHECK_MODULES([UPOWER_GLIB], [upower-glib])
+
+ AC_SUBST(UPOWER_GLIB_CFLAGS)
+ AC_SUBST(UPOWER_GLIB_LIBS)
+fi
+
# Check whether to enable code coverage support.
if test "$enable_coverage" = "yes"; then
COVERAGE_CFLAGS="-MD"
Modified: trunk/Source/autotools/PrintBuildConfiguration.m4 (149758 => 149759)
--- trunk/Source/autotools/PrintBuildConfiguration.m4 2013-05-08 19:28:24 UTC (rev 149758)
+++ trunk/Source/autotools/PrintBuildConfiguration.m4 2013-05-08 19:39:49 UTC (rev 149759)
@@ -17,6 +17,7 @@
WebKit2 support : $enable_webkit2
Accelerated Compositing : $enable_accelerated_compositing
Accelerated 2D canvas : $enable_accelerated_canvas
+ Battery API support : $enable_battery_status
Gamepad support : $enable_gamepad
Geolocation support : $enable_geolocation
HTML5 video element support : $enable_video
Modified: trunk/Source/autotools/ReadCommandLineArguments.m4 (149758 => 149759)
--- trunk/Source/autotools/ReadCommandLineArguments.m4 2013-05-08 19:28:24 UTC (rev 149758)
+++ trunk/Source/autotools/ReadCommandLineArguments.m4 2013-05-08 19:39:49 UTC (rev 149759)
@@ -124,6 +124,13 @@
[enable_web_audio="no"])
AC_MSG_RESULT([$enable_web_audio])
+AC_MSG_CHECKING([whether to enable Battery Status API support])
+AC_ARG_ENABLE(battery_status,
+ AC_HELP_STRING([--enable-battery-status], [enable support for Battery Status API [default=no]]),
+ [],
+ [enable_battery_status="no"])
+AC_MSG_RESULT([$enable_battery_status])
+
AC_MSG_CHECKING([whether to enable code coverage support])
AC_ARG_ENABLE(coverage,
AC_HELP_STRING([--enable-coverage], [enable code coverage support [default=no]]),
Modified: trunk/Source/autotools/SetupWebKitFeatures.m4 (149758 => 149759)
--- trunk/Source/autotools/SetupWebKitFeatures.m4 2013-05-08 19:28:24 UTC (rev 149758)
+++ trunk/Source/autotools/SetupWebKitFeatures.m4 2013-05-08 19:39:49 UTC (rev 149759)
@@ -83,12 +83,17 @@
CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_WEB_AUDIO=0"
fi
+if test "$enable_battery_status" = "yes"; then
+ CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_BATTERY_STATUS=1"
+else
+ CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_BATTERY_STATUS=0"
+fi
+
# This list of features represents those selected for release builds. If you are
# adding a new or unstable feature, you should mark it disabled here. We need to run
# this command now rather than use AC_CONFIG_COMMANDS because automake rules depend
# on the output file (WebKitFeatures.txt).
$srcdir/Tools/gtk/generate-feature-defines-files $CONFIGURABLE_FEATURE_DEFINES \
- ENABLE_BATTERY_STATUS=0 \
ENABLE_BLOB=1 \
ENABLE_CANVAS_PATH=0 \
ENABLE_CANVAS_PROXY=0 \
Modified: trunk/Source/autotools/symbols.filter (149758 => 149759)
--- trunk/Source/autotools/symbols.filter 2013-05-08 19:28:24 UTC (rev 149758)
+++ trunk/Source/autotools/symbols.filter 2013-05-08 19:39:49 UTC (rev 149759)
@@ -315,6 +315,9 @@
_ZN7WebCore6Editor26toggleOverwriteModeEnabledEv;
_ZNK7WebCore14FrameSelection6boundsEb;
_ZN7WebCore10ClientRectC1ERKNS_9FloatRectE;
+_ZN7WebCore13BatteryStatus6createEbddd;
+_ZN7WebCore17BatteryController14supplementNameEv;
+_ZN7WebCore17BatteryController22didChangeBatteryStatusERKN3WTF12AtomicStringENS1_10PassRefPtrINS_13BatteryStatusEEE;
local:
_Z*;
Modified: trunk/Tools/ChangeLog (149758 => 149759)
--- trunk/Tools/ChangeLog 2013-05-08 19:28:24 UTC (rev 149758)
+++ trunk/Tools/ChangeLog 2013-05-08 19:39:49 UTC (rev 149759)
@@ -1,3 +1,14 @@
+2013-05-08 José Dapena Paz <[email protected]> and Zan Dobersek <[email protected]>
+
+ [GTK] Plumb the Automake build system for the Battery Status API feature
+ https://bugs.webkit.org/show_bug.cgi?id=115718
+
+ Reviewed by Martin Robinson.
+
+ * Scripts/webkitdirs.pm:
+ (buildAutotoolsProject): List battery-status as a configurable feature, meaning its value will be adjusted
+ through the --(enable|disable)-battery-status flag passed to configure.
+
2013-05-08 Ryosuke Niwa <[email protected]>
new-run-webkit-websocketserver doesn't work after Chromium removal
Modified: trunk/Tools/Scripts/webkitdirs.pm (149758 => 149759)
--- trunk/Tools/Scripts/webkitdirs.pm 2013-05-08 19:28:24 UTC (rev 149758)
+++ trunk/Tools/Scripts/webkitdirs.pm 2013-05-08 19:39:49 UTC (rev 149759)
@@ -1925,6 +1925,7 @@
# Configurable features listed here should be kept in sync with the
# features for which there exists a configuration option in configure.ac.
my %configurableFeatures = (
+ "battery-status" => 1,
"gamepad" => 1,
"geolocation" => 1,
"svg" => 1,
