| OLD | NEW |
| 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 #include "mojo/services/html_viewer/weblayertreeview_impl.h" | 5 #include "mojo/services/html_viewer/weblayertreeview_impl.h" |
| 6 | 6 |
| 7 #include "base/message_loop/message_loop_proxy.h" | 7 #include "base/message_loop/message_loop_proxy.h" |
| 8 #include "cc/blink/web_layer_impl.h" | 8 #include "cc/blink/web_layer_impl.h" |
| 9 #include "cc/layers/layer.h" | 9 #include "cc/layers/layer.h" |
| 10 #include "cc/output/begin_frame_args.h" | 10 #include "cc/output/begin_frame_args.h" |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 | 113 |
| 114 void WebLayerTreeViewImpl::DidCommit() { | 114 void WebLayerTreeViewImpl::DidCommit() { |
| 115 } | 115 } |
| 116 | 116 |
| 117 void WebLayerTreeViewImpl::DidCommitAndDrawFrame() { | 117 void WebLayerTreeViewImpl::DidCommitAndDrawFrame() { |
| 118 } | 118 } |
| 119 | 119 |
| 120 void WebLayerTreeViewImpl::DidCompleteSwapBuffers() { | 120 void WebLayerTreeViewImpl::DidCompleteSwapBuffers() { |
| 121 } | 121 } |
| 122 | 122 |
| 123 void WebLayerTreeViewImpl::setSurfaceReady() { | |
| 124 } | |
| 125 | |
| 126 void WebLayerTreeViewImpl::setRootLayer(const blink::WebLayer& layer) { | 123 void WebLayerTreeViewImpl::setRootLayer(const blink::WebLayer& layer) { |
| 127 layer_tree_host_->SetRootLayer( | 124 layer_tree_host_->SetRootLayer( |
| 128 static_cast<const cc_blink::WebLayerImpl*>(&layer)->layer()); | 125 static_cast<const cc_blink::WebLayerImpl*>(&layer)->layer()); |
| 129 } | 126 } |
| 130 | 127 |
| 131 void WebLayerTreeViewImpl::clearRootLayer() { | 128 void WebLayerTreeViewImpl::clearRootLayer() { |
| 132 layer_tree_host_->SetRootLayer(scoped_refptr<cc::Layer>()); | 129 layer_tree_host_->SetRootLayer(scoped_refptr<cc::Layer>()); |
| 133 } | 130 } |
| 134 | 131 |
| 135 void WebLayerTreeViewImpl::setViewportSize( | 132 void WebLayerTreeViewImpl::setViewportSize( |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 252 base::Bind(&WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread, | 249 base::Bind(&WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread, |
| 253 main_thread_bound_weak_ptr_, | 250 main_thread_bound_weak_ptr_, |
| 254 id)); | 251 id)); |
| 255 } | 252 } |
| 256 | 253 |
| 257 void WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread(cc::SurfaceId id) { | 254 void WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread(cc::SurfaceId id) { |
| 258 view_->SetSurfaceId(SurfaceId::From(id)); | 255 view_->SetSurfaceId(SurfaceId::From(id)); |
| 259 } | 256 } |
| 260 | 257 |
| 261 } // namespace mojo | 258 } // namespace mojo |
| OLD | NEW |