Migrates battery_status from content/renderer/ to WebKit/platform/

third_party/WebKit/Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 74 matching lines @@
 #include "core/page/Page.h"
 #include "core/page/PagePopupClient.h"
 #include "core/page/PointerLockController.h"
 #include "core/page/ScopedPageLoadDeferrer.h"
 #include "core/page/TouchDisambiguation.h"
 #include "core/paint/PaintLayer.h"
 #include "core/timing/DOMWindowPerformance.h"
 #include "core/timing/Performance.h"
 #include "modules/accessibility/AXObject.h"
 #include "modules/accessibility/AXObjectCacheImpl.h"
+#include "modules/battery/BatteryDispatcher.h"
 #include "modules/credentialmanager/CredentialManagerClient.h"
 #include "modules/encryptedmedia/MediaKeysController.h"
 #include "modules/storage/StorageNamespaceController.h"
 #include "modules/webgl/WebGLRenderingContext.h"
 #include "platform/ContextMenu.h"
 #include "platform/ContextMenuItem.h"
 #include "platform/Cursor.h"
 #include "platform/Histogram.h"
 #include "platform/KeyboardCodes.h"
 #include "platform/Logging.h"
@@ skipping 4414 matching lines @@
 void WebViewImpl::forceNextWebGLContextCreationToFail()
 {
     WebGLRenderingContext::forceNextWebGLContextCreationToFail();
 }
 
 void WebViewImpl::forceNextDrawingBufferCreationToFail()
 {
     DrawingBuffer::forceNextDrawingBufferCreationToFail();
 }
 
+void WebViewImpl::updateBatteryStatusForTesting(bool charging, double chargingTime, double dischargingTime, double level)
+{
+    BatteryDispatcher::instance().OnUpdateBatteryStatus(

[esprehn, 2016/02/18 06:48:13]

This should be exposed in the platform API, not through the web view.

[haraken, 2016/02/18 11:38:04]

Just to confirm: Do you mean public/web/? This is an API from content/ to Blink,
it should be in public/web/, not in public/platform/.

However, a better option would be moving testRunner.updateBatteryStatus to
window.internals.updateBatteryStatus. Then no public APIs will be needed.

(I'm not sure how much we want to stick to this point because once we build up
the Mojo-JS bindings, this API will be gone anyway. But if you spend time on
moving the API to public/web/, it would be better to spend time to move it to
window.internals.)

+        BatteryStatus(charging, chargingTime, dischargingTime, level));
+}
+
+void WebViewImpl::resetBatteryStatusForTesting()

[esprehn, 2016/02/18 06:48:13]

Ditto

+{
+    BatteryDispatcher::instance().OnUpdateBatteryStatus(BatteryStatus());
+}
+
 void WebViewImpl::updatePageOverlays()
 {
     if (m_pageColorOverlay)
         m_pageColorOverlay->update();
     if (InspectorOverlay* overlay = inspectorOverlay()) {
         PageOverlay* inspectorPageOverlay = overlay->pageOverlay();
         if (inspectorPageOverlay)
             inspectorPageOverlay->update();
     }
 }
@@ skipping 33 matching lines @@
 {
     // TODO(oshima): Investigate if this should return the ScreenInfo's scale factor rather than
     // page's scale factor, which can be 1 in use-zoom-for-dsf mode.
     if (!page())
         return 1;
 
     return page()->deviceScaleFactor();
 }
 
 } // namespace blink