Add testRunner.copyAtAndCapturePixelsAsyncThen() method

content/shell/renderer/test_runner/test_runner.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/shell/renderer/test_runner/test_runner.h"
 
 #include <limits>
 
 #include "base/logging.h"
 #include "content/shell/common/test_runner/test_preferences.h"
@@ skipping 263 matching lines @@
   void AddMockSpeechRecognitionResult(const std::string& transcript,
                                       double confidence);
   void SetMockSpeechRecognitionError(const std::string& error,
                                      const std::string& message);
   bool WasMockSpeechRecognitionAborted();
   void AddWebPageOverlay();
   void RemoveWebPageOverlay();
   void DisplayAsync();
   void DisplayAsyncThen(v8::Handle<v8::Function> callback);
   void CapturePixelsAsyncThen(v8::Handle<v8::Function> callback);
+  void CopyAtAndCapturePixelsAsyncThen(int x, int y, v8::Handle<v8::Function> callback);
   void SetCustomTextOutput(std::string output);
   void SetViewSourceForFrame(const std::string& name, bool enabled);
   void SetMockPushClientSuccess(const std::string& endpoint,
                                 const std::string& registration_id);
   void SetMockPushClientError(const std::string& message);
 
   bool GlobalFlag();
   void SetGlobalFlag(bool value);
   std::string PlatformName();
   std::string TooltipText();
@@ skipping 227 matching lines @@
                  &TestRunnerBindings::SetMockSpeechRecognitionError)
       .SetMethod("wasMockSpeechRecognitionAborted",
                  &TestRunnerBindings::WasMockSpeechRecognitionAborted)
       .SetMethod("addWebPageOverlay", &TestRunnerBindings::AddWebPageOverlay)
       .SetMethod("removeWebPageOverlay",
                  &TestRunnerBindings::RemoveWebPageOverlay)
       .SetMethod("displayAsync", &TestRunnerBindings::DisplayAsync)
       .SetMethod("displayAsyncThen", &TestRunnerBindings::DisplayAsyncThen)
       .SetMethod("capturePixelsAsyncThen",
                  &TestRunnerBindings::CapturePixelsAsyncThen)
+      .SetMethod("copyAtAndCapturePixelsAsyncThen",

[Ken Russell (switch to Gerrit), 2014/07/16 20:40:50]

Please name this copyImageAtAndCapturePixelsAsyncThen. Or perhaps
copyImageAtAndReadbackAsyncThen.

[hj.r.chung, 2014/07/17 05:33:39]

Done.

+                 &TestRunnerBindings::CopyAtAndCapturePixelsAsyncThen)
       .SetMethod("setCustomTextOutput",
                  &TestRunnerBindings::SetCustomTextOutput)
       .SetMethod("setViewSourceForFrame",
                  &TestRunnerBindings::SetViewSourceForFrame)
       .SetMethod("setMockPushClientSuccess",
                  &TestRunnerBindings::SetMockPushClientSuccess)
       .SetMethod("setMockPushClientError",
                  &TestRunnerBindings::SetMockPushClientError)
 
       // Properties.
@@ skipping 802 matching lines @@
   if (runner_)
     runner_->DisplayAsyncThen(callback);
 }
 
 void TestRunnerBindings::CapturePixelsAsyncThen(
     v8::Handle<v8::Function> callback) {
   if (runner_)
     runner_->CapturePixelsAsyncThen(callback);
 }
 
+void TestRunnerBindings::CopyAtAndCapturePixelsAsyncThen(
+    int x, int y, v8::Handle<v8::Function> callback) {
+  if (runner_)
+    runner_->CopyAtAndCapturePixelsAsyncThen(x, y, callback);
+}
+
 void TestRunnerBindings::SetCustomTextOutput(std::string output) {
   runner_->setCustomTextOutput(output);
 }
 
 void TestRunnerBindings::SetViewSourceForFrame(const std::string& name,
                                                bool enabled) {
   if (runner_ && runner_->web_view_) {
     WebFrame* target_frame =
         runner_->web_view_->findFrameByName(WebString::fromUTF8(name));
     if (target_frame)
@@ skipping 1419 matching lines @@
 }
 
 void TestRunner::CapturePixelsAsyncThen(v8::Handle<v8::Function> callback) {
   scoped_ptr<InvokeCallbackTask> task(
       new InvokeCallbackTask(this, callback));
   proxy_->CapturePixelsAsync(base::Bind(&TestRunner::CapturePixelsCallback,
                                         base::Unretained(this),
                                         base::Passed(&task)));
 }
 
+void TestRunner::CopyAtAndCapturePixelsAsyncThen(
+    int x, int y, v8::Handle<v8::Function> callback) {
+  scoped_ptr<InvokeCallbackTask> task(
+      new InvokeCallbackTask(this, callback));
+  proxy_->CopyAtAndCapturePixels(x,
+                                 y,
+                                 base::Bind(&TestRunner::CapturePixelsCallback,
+                                            base::Unretained(this),
+                                            base::Passed(&task)));
+}
+
 void TestRunner::CapturePixelsCallback(scoped_ptr<InvokeCallbackTask> task,
                                        const SkBitmap& snapshot) {
   v8::Isolate* isolate = blink::mainThreadIsolate();
   v8::HandleScope handle_scope(isolate);
 
   v8::Handle<v8::Context> context =
       web_view_->mainFrame()->mainWorldScriptContext();
   if (context.IsEmpty())
     return;
 
@@ skipping 87 matching lines @@
 }
 
 void TestRunner::DidLosePointerLockInternal() {
   bool was_locked = pointer_locked_;
   pointer_locked_ = false;
   if (was_locked)
     web_view_->didLosePointerLock();
 }
 
 }  // namespace content