Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(198)

Unified Diff: content/shell/renderer/test_runner/test_runner.cc

Issue 298263002: Battery Status API: add testing support for LayoutTests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: some style fixes Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/shell/renderer/test_runner/test_runner.cc
diff --git a/content/shell/renderer/test_runner/test_runner.cc b/content/shell/renderer/test_runner/test_runner.cc
index 981ca526b2d18acbc6d031353a488e3662d974f6..9e4251a44e2e1d534edee7e9dca035f4ca7a7250 100644
--- a/content/shell/renderer/test_runner/test_runner.cc
+++ b/content/shell/renderer/test_runner/test_runner.cc
@@ -19,6 +19,7 @@
#include "gin/handle.h"
#include "gin/object_template_builder.h"
#include "gin/wrappable.h"
+#include "third_party/WebKit/public/platform/WebBatteryStatus.h"
#include "third_party/WebKit/public/platform/WebCanvas.h"
#include "third_party/WebKit/public/platform/WebData.h"
#include "third_party/WebKit/public/platform/WebDeviceMotionData.h"
@@ -173,6 +174,8 @@ class TestRunnerBindings : public gin::Wrappable<TestRunnerBindings> {
void SetMockDeviceMotion(gin::Arguments* args);
void SetMockDeviceOrientation(gin::Arguments* args);
void SetMockScreenOrientation(const std::string& orientation);
+ void DidChangeBatteryStatus(gin::Arguments* args);
+
void DidAcquirePointerLock();
void DidNotAcquirePointerLock();
void DidLosePointerLock();
@@ -363,6 +366,8 @@ gin::ObjectTemplateBuilder TestRunnerBindings::GetObjectTemplateBuilder(
&TestRunnerBindings::SetMockDeviceOrientation)
.SetMethod("setMockScreenOrientation",
&TestRunnerBindings::SetMockScreenOrientation)
+ .SetMethod("didChangeBatteryStatus",
+ &TestRunnerBindings::DidChangeBatteryStatus)
.SetMethod("didAcquirePointerLock",
&TestRunnerBindings::DidAcquirePointerLock)
.SetMethod("didNotAcquirePointerLock",
@@ -864,6 +869,24 @@ void TestRunnerBindings::SetMockScreenOrientation(const std::string& orientation
runner_->SetMockScreenOrientation(orientation);
}
+void TestRunnerBindings::DidChangeBatteryStatus(gin::Arguments* args) {
jochen (gone - plz use gerrit) 2014/05/28 12:08:17 you don't need to use gin::Arguments, just use boo
timvolodine 2014/05/29 08:52:06 that's great! done.
+ if (!runner_)
+ return;
+
+ bool charging;
+ double chargingTime;
+ double dischargingTime;
+ double level;
+
+ args->GetNext(&charging);
+ args->GetNext(&chargingTime);
+ args->GetNext(&dischargingTime);
+ args->GetNext(&level);
+
+ runner_->DidChangeBatteryStatus(charging, chargingTime,
+ dischargingTime, level);
+}
+
void TestRunnerBindings::DidAcquirePointerLock() {
if (runner_)
runner_->DidAcquirePointerLock();
@@ -2227,6 +2250,18 @@ void TestRunner::SetMockScreenOrientation(const std::string& orientation_str) {
delegate_->setScreenOrientation(orientation);
}
+void TestRunner::DidChangeBatteryStatus(bool charging,
+ double chargingTime,
+ double dischargingTime,
+ double level) {
+ blink::WebBatteryStatus status;
+ status.charging = charging;
+ status.chargingTime = chargingTime;
+ status.dischargingTime = dischargingTime;
+ status.level = level;
+ delegate_->didChangeBatteryStatus(status);
+}
+
void TestRunner::DidAcquirePointerLock() {
DidAcquirePointerLockInternal();
}

Powered by Google App Engine
This is Rietveld 408576698