| Index: sky/viewer/document_view.h
|
| diff --git a/sky/viewer/document_view.h b/sky/viewer/document_view.h
|
| index 03639d0448bf11d1ab809e40ba872ac3f3a559b1..d71b9b56458ebcfa6520da50bc05ff953d883a85 100644
|
| --- a/sky/viewer/document_view.h
|
| +++ b/sky/viewer/document_view.h
|
| @@ -22,11 +22,14 @@
|
| #include "sky/compositor/layer_client.h"
|
| #include "sky/compositor/layer_host_client.h"
|
| #include "sky/engine/public/platform/ServiceProvider.h"
|
| +#include "sky/engine/public/sky/sky_view.h"
|
| +#include "sky/engine/public/sky/sky_view_client.h"
|
| #include "sky/engine/public/web/WebFrameClient.h"
|
| #include "sky/engine/public/web/WebViewClient.h"
|
| #include "sky/services/testing/test_harness.mojom.h"
|
| #include "ui/events/gestures/gesture_types.h"
|
|
|
| +
|
| namespace mojo {
|
| class ViewManager;
|
| class View;
|
| @@ -41,6 +44,7 @@ class LayerHost;
|
| class DocumentView : public blink::ServiceProvider,
|
| public blink::WebFrameClient,
|
| public blink::WebViewClient,
|
| + public blink::SkyViewClient,
|
| public mojo::ViewManagerDelegate,
|
| public mojo::ViewObserver,
|
| public sky::LayerClient,
|
| @@ -66,6 +70,9 @@ class DocumentView : public blink::ServiceProvider,
|
| // sky::LayerClient
|
| void PaintContents(SkCanvas* canvas, const gfx::Rect& clip) override;
|
|
|
| + // SkyViewClient methods:
|
| + void ScheduleFrame() override;
|
| +
|
| void StartDebuggerInspectorBackend();
|
|
|
| void GetPixelsForTesting(std::vector<unsigned char>* pixels);
|
| @@ -135,6 +142,7 @@ class DocumentView : public blink::ServiceProvider,
|
| mojo::Shell* shell_;
|
| TestHarnessPtr test_harness_;
|
| mojo::NavigatorHostPtr navigator_host_;
|
| + std::unique_ptr<blink::SkyView> sky_view_;
|
| blink::WebView* web_view_;
|
| mojo::View* root_;
|
| mojo::ViewManagerClientFactory view_manager_client_factory_;
|
|
|