| Index: content/shell/browser/layout_test/blink_test_controller.h
|
| diff --git a/content/shell/browser/layout_test/blink_test_controller.h b/content/shell/browser/layout_test/blink_test_controller.h
|
| index 47d3760466253ddecf9bcf6c8174f0e890e13db3..0a973f68f485892c32d859e88376900320e29f86 100644
|
| --- a/content/shell/browser/layout_test/blink_test_controller.h
|
| +++ b/content/shell/browser/layout_test/blink_test_controller.h
|
| @@ -13,6 +13,7 @@
|
| #include "base/files/file_path.h"
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "base/memory/shared_memory.h"
|
| #include "base/scoped_observer.h"
|
| #include "base/synchronization/lock.h"
|
| #include "base/threading/non_thread_safe.h"
|
| @@ -33,10 +34,6 @@
|
|
|
| class SkBitmap;
|
|
|
| -namespace test_runner {
|
| -struct LayoutDumpFlags;
|
| -}
|
| -
|
| namespace url {
|
| class Origin;
|
| }
|
| @@ -194,8 +191,7 @@ class BlinkTestController : public base::NonThreadSafe,
|
| void OnAudioDump(const std::vector<unsigned char>& audio_dump);
|
| void OnImageDump(const std::string& actual_pixel_hash, const SkBitmap& image);
|
| void OnTextDump(const std::string& dump);
|
| - void OnInitiateLayoutDump(
|
| - const test_runner::LayoutDumpFlags& layout_dump_flags);
|
| + void OnInitiateLayoutDump(bool dump_child_frames);
|
| void OnLayoutDumpResponse(RenderFrameHost* sender, const std::string& dump);
|
| void OnPrintMessage(const std::string& message);
|
| void OnOverridePreferences(const WebPreferences& prefs);
|
| @@ -265,6 +261,9 @@ class BlinkTestController : public base::NonThreadSafe,
|
| ScopedObserver<RenderProcessHost, RenderProcessHostObserver>
|
| render_process_host_observer_;
|
|
|
| + // Memory backing LayoutDumpFlags (shared across all renderers).
|
| + base::SharedMemory layout_dump_flags_memory_;
|
| +
|
| #if defined(OS_ANDROID)
|
| // Because of the nested message pump implementation, Android needs to allow
|
| // waiting on the UI thread while layout tests are being ran.
|
|
|