Changeset 160437 in webkit

Timestamp:

Dec 11, 2013 8:46:18 AM (10 years ago)

Author:

zandobersek@gmail.com

Message:

[GTK][WK1] Add an empty BatteryClientGtk
​https://bugs.webkit.org/show_bug.cgi?id=115628

Reviewed by Martin Robinson.

Add an empty BatteryClientGtk, implementing the WebCore's BatteryClient interface.
The implementation is left empty intentionally as the WebKit1 port is now in maintenance
mode and there's no desire to support new features under it. It's still required as the
WebCore implementation of the Battery Status API expects an existing BatteryClient, even
if the latter does not set up a provider that would then serve information about the battery
state.

• GNUmakefile.am: Add the BatteryClientGtk source files to the build.
• WebCoreSupport/BatteryClientGtk.cpp: Added.

(WebKit):
(WebKit::BatteryClientGtk::BatteryClientGtk):
(WebKit::BatteryClientGtk::startUpdating):
(WebKit::BatteryClientGtk::stopUpdating):
(WebKit::BatteryClientGtk::batteryControllerDestroyed):

• WebCoreSupport/BatteryClientGtk.h: Added.

(WebKit):
(BatteryClientGtk):

• webkit/webkitwebview.cpp:

(webkit_web_view_init): Set up the BatteryClientGtk for the new WebCore::Page object.

Location:

trunk/Source/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.am (modified) (1 diff)
• WebCoreSupport/BatteryClientGtk.cpp (added)
• WebCoreSupport/BatteryClientGtk.h (added)
• webkit/webkitwebview.cpp (modified) (2 diffs)

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2013-12-11  José Dapena Paz  <jdapena@igalia.com> and Zan Dobersek  <zdobersek@igalia.com>
+
+        [GTK][WK1] Add an empty BatteryClientGtk
+        https://bugs.webkit.org/show_bug.cgi?id=115628
+
+        Reviewed by Martin Robinson.
+
+        Add an empty BatteryClientGtk, implementing the WebCore's BatteryClient interface.
+        The implementation is left empty intentionally as the WebKit1 port is now in maintenance
+        mode and there's no desire to support new features under it. It's still required as the
+        WebCore implementation of the Battery Status API expects an existing BatteryClient, even
+        if the latter does not set up a provider that would then serve information about the battery
+        state.
+
+        * GNUmakefile.am: Add the BatteryClientGtk source files to the build.
+        * WebCoreSupport/BatteryClientGtk.cpp: Added.
+        (WebKit):
+        (WebKit::BatteryClientGtk::BatteryClientGtk):
+        (WebKit::BatteryClientGtk::startUpdating):
+        (WebKit::BatteryClientGtk::stopUpdating):
+        (WebKit::BatteryClientGtk::batteryControllerDestroyed):
+        * WebCoreSupport/BatteryClientGtk.h: Added.
+        (WebKit):
+        (BatteryClientGtk):
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_init): Set up the BatteryClientGtk for the new WebCore::Page object.
+
 2013-12-11  Brendan Long  <b.long@cablelabs.com>
 

trunk/Source/WebKit/gtk/GNUmakefile.am

@@ -193 +193 @@
         Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp \
         Source/WebKit/gtk/WebCoreSupport/AssertMatchingEnums.cpp \
+        Source/WebKit/gtk/WebCoreSupport/BatteryClientGtk.cpp \
+        Source/WebKit/gtk/WebCoreSupport/BatteryClientGtk.h \
         Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \
         Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \

trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp

@@ -36 +36 @@
 #include "ArchiveResource.h"
 #include "BackForwardList.h"
+#include "BatteryClientGtk.h"
 #include "CairoUtilities.h"
 #include "Chrome.h"
@@ -3838 +3839 @@
 #endif
 
+#if ENABLE(BATTERY_STATUS)
+    WebCore::provideBatteryTo(priv->corePage, new BatteryClientGtk);
+#endif
+
     if (DumpRenderTreeSupportGtk::dumpRenderTreeModeEnabled()) {
         // Set some testing-specific settings