Revert of Moving pixel-capturing code from web_test_proxy_base.* into pixel_dump.*

components/test_runner/test_runner.h

 // 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.
 
 #ifndef COMPONENTS_TEST_RUNNER_TEST_RUNNER_H_
 #define COMPONENTS_TEST_RUNNER_TEST_RUNNER_H_
 
 #include <stdint.h>
 
 #include <deque>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "components/test_runner/layout_test_runtime_flags.h"
 #include "components/test_runner/test_runner_export.h"
 #include "components/test_runner/web_task.h"
 #include "components/test_runner/web_test_runner.h"
-#include "third_party/WebKit/public/platform/WebImage.h"
 #include "v8/include/v8.h"
 
 class GURL;
 class SkBitmap;
 
 namespace blink {
 class WebContentSettingsClient;
 class WebFrame;
 class WebMediaStream;
 class WebString;
@@ skipping 37 matching lines @@
   bool UseMockTheme() const { return use_mock_theme_; }
 
   void InvokeCallback(scoped_ptr<InvokeCallbackTask> callback);
 
   // WebTestRunner implementation.
   bool ShouldGeneratePixelResults() override;
   bool ShouldDumpAsAudio() const override;
   void GetAudioData(std::vector<unsigned char>* buffer_view) const override;
   bool IsRecursiveLayoutDumpRequested() override;
   std::string DumpLayout(blink::WebLocalFrame* frame) override;
-  void DumpPixelsAsync(
-      blink::WebView* web_view,
-      const base::Callback<void(const SkBitmap&)>& callback) override;
   void ReplicateLayoutTestRuntimeFlagsChanges(
       const base::DictionaryValue& changed_values) override;
   bool HasCustomTextDump(std::string* custom_text_dump) const override;
   bool ShouldDumpBackForwardList() const override;
   blink::WebContentSettingsClient* GetWebContentSettings() const override;
 
   // Methods used by WebTestProxyBase and WebFrameTestClient.
   std::string GetAcceptLanguages() const;
   bool shouldStayOnPageAfterHandlingBeforeUnload() const;
   MockScreenOrientationClient* getMockScreenOrientationClient();
   MockWebUserMediaClient* getMockWebUserMediaClient();
+  bool shouldDumpSelectionRect() const;
   bool isPrinting() const;
   bool shouldDumpAsTextWithPixelResults();
   bool shouldDumpAsCustomText() const;
   std:: string customDumpText() const;
   void ShowDevTools(const std::string& settings,
                     const std::string& frontend_url);
   void ClearDevToolsLocalStorage();
   void setShouldDumpAsText(bool);
   void setShouldDumpAsMarkup(bool);
   void setCustomTextOutput(const std::string& text);
@@ skipping 21 matching lines @@
   void policyDelegateDone();
   bool policyDelegateEnabled() const;
   bool policyDelegateIsPermissive() const;
   bool policyDelegateShouldNotifyDone() const;
   bool shouldInterceptPostMessage() const;
   bool shouldDumpResourcePriorities() const;
   bool RequestPointerLock();
   void RequestPointerUnlock();
   bool isPointerLocked();
   void setToolTipText(const blink::WebString&);
-  void setDragImage(const blink::WebImage& drag_image);
+  bool shouldDumpDragImage();
   bool shouldDumpNavigationPolicy() const;
 
   bool midiAccessorResult();
 
   // Methods used by MockColorChooser:
   void DidOpenChooser();
   void DidCloseChooser();
 
   // A single item in the work queue.
   class WorkItem {
@@ skipping 328 matching lines @@
   // changes. It takes no arguments, and ignores any that may be present.
   void DumpResourceRequestPriorities();
 
   // Sets a flag to enable the mock theme.
   void SetUseMockTheme(bool use);
 
   // Sets a flag that causes the test to be marked as completed when the
   // WebFrameClient receives a loadURLExternally() call.
   void WaitUntilExternalURLLoad();
 
-  // This function sets a flag to dump the drag image when the next drag&drop is
-  // initiated. It is equivalent to DumpAsTextWithPixelResults but the pixel
-  // results will be the drag image instead of a snapshot of the page.
+  // This function sets a flag which tells the WebTestProxy to dump the drag
+  // image when the next drag-and-drop is initiated. It is equivalent to
+  // DumpAsTextWithPixelResults but the pixel results will be the drag image
+  // instead of a snapshot of the page.
   void DumpDragImage();
 
   // Sets a flag that tells the WebTestProxy to dump the default navigation
   // policy passed to the decidePolicyForNavigation callback.
   void DumpNavigationPolicy();
 
   // Dump current PageImportanceSignals for the page.
   void DumpPageImportanceSignals();
 
   ///////////////////////////////////////////////////////////////////////////
@@ skipping 253 matching lines @@
   bool dump_window_status_changes_;
 
   // If true, the test_shell will output descriptive test for spellcheck
   // execution.
   bool dump_spell_check_callbacks_;
 
   // If true, the test_shell will produce a dump of the back forward list as
   // well.
   bool dump_back_forward_list_;
 
+  // If true, the test_shell will draw the bounds of the current selection rect
+  // taking possible transforms of the selection rect into account.
+  bool dump_selection_rect_;
+
+  // If true, the test_shell will dump the drag image as pixel results.
+  bool dump_drag_image_;
+
   // If true, content_shell will dump the default navigation policy passed to
   // WebFrameClient::decidePolicyForNavigation.
   bool dump_navigation_policy_;
 
   // If true, pixel dump will be produced as a series of 1px-tall, view-wide
   // individual paints over the height of the view.
   bool test_repaint_;
 
   // If true and test_repaint_ is true as well, pixel dump will be produced as
   // a series of 1px-wide, view-tall paints across the width of the view.
@@ skipping 35 matching lines @@
     PointerLockWillFailSync,
   } pointer_lock_planned_result_;
   bool use_mock_theme_;
 
   scoped_ptr<MockScreenOrientationClient> mock_screen_orientation_client_;
   scoped_ptr<MockWebUserMediaClient> user_media_client_;
 
   // Number of currently active color choosers.
   int chooser_count_;
 
-  // Captured drag image.
-  blink::WebImage drag_image_;
-
   base::WeakPtrFactory<TestRunner> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TestRunner);
 };
 
 }  // namespace test_runner
 
 #endif  // COMPONENTS_TEST_RUNNER_TEST_RUNNER_H_