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

Side by Side Diff: sky/viewer/document_view.h

Issue 797063002: Make reftests work for sky. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: address review comments Created 6 years 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 unified diff | Download patch
« no previous file with comments | « sky/tools/webkitpy/layout_tests/port/base.py ('k') | sky/viewer/document_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef SKY_VIEWER_DOCUMENT_VIEW_H_ 5 #ifndef SKY_VIEWER_DOCUMENT_VIEW_H_
6 #define SKY_VIEWER_DOCUMENT_VIEW_H_ 6 #define SKY_VIEWER_DOCUMENT_VIEW_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "mojo/public/cpp/application/lazy_interface_ptr.h" 10 #include "mojo/public/cpp/application/lazy_interface_ptr.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 63
64 // sky::LayerHostClient 64 // sky::LayerHostClient
65 mojo::Shell* GetShell() override; 65 mojo::Shell* GetShell() override;
66 void BeginFrame(base::TimeTicks frame_time) override; 66 void BeginFrame(base::TimeTicks frame_time) override;
67 void OnSurfaceIdAvailable(mojo::SurfaceIdPtr surface_id) override; 67 void OnSurfaceIdAvailable(mojo::SurfaceIdPtr surface_id) override;
68 // sky::LayerClient 68 // sky::LayerClient
69 void PaintContents(SkCanvas* canvas, const gfx::Rect& clip) override; 69 void PaintContents(SkCanvas* canvas, const gfx::Rect& clip) override;
70 70
71 void StartDebuggerInspectorBackend(); 71 void StartDebuggerInspectorBackend();
72 72
73 void GetPixelsForTesting(std::vector<unsigned char>* pixels);
74
73 private: 75 private:
74 // WebWidgetClient methods: 76 // WebWidgetClient methods:
75 void initializeLayerTreeView() override; 77 void initializeLayerTreeView() override;
76 void scheduleAnimation() override; 78 void scheduleAnimation() override;
77 79
78 // WebFrameClient methods: 80 // WebFrameClient methods:
79 mojo::View* createChildFrame(const blink::WebURL& url) override; 81 mojo::View* createChildFrame(const blink::WebURL& url) override;
80 void frameDetached(blink::WebFrame*) override; 82 void frameDetached(blink::WebFrame*) override;
81 blink::WebNavigationPolicy decidePolicyForNavigation( 83 blink::WebNavigationPolicy decidePolicyForNavigation(
82 const blink::WebFrameClient::NavigationPolicyInfo& info) override; 84 const blink::WebFrameClient::NavigationPolicyInfo& info) override;
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 mojo::LazyInterfacePtr<mojo::NavigatorHost> navigator_host_; 124 mojo::LazyInterfacePtr<mojo::NavigatorHost> navigator_host_;
123 blink::WebView* web_view_; 125 blink::WebView* web_view_;
124 mojo::View* root_; 126 mojo::View* root_;
125 mojo::ViewManagerClientFactory view_manager_client_factory_; 127 mojo::ViewManagerClientFactory view_manager_client_factory_;
126 InspectorServiceFactory inspector_service_factory_; 128 InspectorServiceFactory inspector_service_factory_;
127 scoped_ptr<LayerHost> layer_host_; 129 scoped_ptr<LayerHost> layer_host_;
128 scoped_refptr<Layer> root_layer_; 130 scoped_refptr<Layer> root_layer_;
129 scoped_ptr<ScriptRunner> script_runner_; 131 scoped_ptr<ScriptRunner> script_runner_;
130 scoped_ptr<InspectorHostImpl> inspector_host_; 132 scoped_ptr<InspectorHostImpl> inspector_host_;
131 scoped_ptr<inspector::InspectorBackendMojo> inspector_backend_; 133 scoped_ptr<inspector::InspectorBackendMojo> inspector_backend_;
134 base::WeakPtrFactory<DocumentView> weak_factory_;
132 int debugger_id_; 135 int debugger_id_;
133 136
134 base::WeakPtrFactory<DocumentView> weak_factory_;
135 DISALLOW_COPY_AND_ASSIGN(DocumentView); 137 DISALLOW_COPY_AND_ASSIGN(DocumentView);
136 }; 138 };
137 139
138 } // namespace sky 140 } // namespace sky
139 141
140 #endif // SKY_VIEWER_DOCUMENT_VIEW_H_ 142 #endif // SKY_VIEWER_DOCUMENT_VIEW_H_
OLDNEW
« no previous file with comments | « sky/tools/webkitpy/layout_tests/port/base.py ('k') | sky/viewer/document_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698