OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "components/html_viewer/html_frame.h" | 5 #include "components/html_viewer/html_frame.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <limits> | 8 #include <limits> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
592 | 592 |
593 void HTMLFrame::didCancelCompositionOnSelectionChange() { | 593 void HTMLFrame::didCancelCompositionOnSelectionChange() { |
594 // TODO(penghuang): Update text input state. | 594 // TODO(penghuang): Update text input state. |
595 } | 595 } |
596 | 596 |
597 void HTMLFrame::didChangeContents() { | 597 void HTMLFrame::didChangeContents() { |
598 // TODO(penghuang): Update text input state. | 598 // TODO(penghuang): Update text input state. |
599 } | 599 } |
600 | 600 |
601 void HTMLFrame::initializeLayerTreeView() { | 601 void HTMLFrame::initializeLayerTreeView() { |
602 mojo::URLRequestPtr request(mojo::URLRequest::New()); | 602 DCHECK(view()); |
603 request->url = mojo::String::From("mojo:view_manager"); | 603 |
604 mojo::SurfacePtr surface; | 604 mojo::CompositorFrameReceiverPtr receiver; |
605 GetLocalRootApp()->ConnectToService(request.Pass(), &surface); | 605 view()->RequestCompositorFrameReceiver(GetProxy(&receiver)); |
rjkroege
2015/08/19 23:45:44
This mojo GetProxy name overlaps badly with the cc
Fady Samuel
2015/08/20 16:22:44
Acknowledged.
rjkroege
2015/08/21 18:54:45
perhaps you could do mojo::GetProxy for clarity?
Fady Samuel
2015/08/21 21:31:10
Done.
| |
606 | 606 |
607 mojo::URLRequestPtr request2(mojo::URLRequest::New()); | 607 mojo::URLRequestPtr request2(mojo::URLRequest::New()); |
608 request2->url = mojo::String::From("mojo:view_manager"); | 608 request2->url = mojo::String::From("mojo:view_manager"); |
609 mojo::GpuPtr gpu_service; | 609 mojo::GpuPtr gpu_service; |
610 GetLocalRootApp()->ConnectToService(request2.Pass(), &gpu_service); | 610 GetLocalRootApp()->ConnectToService(request2.Pass(), &gpu_service); |
611 web_layer_tree_view_impl_.reset(new WebLayerTreeViewImpl( | 611 web_layer_tree_view_impl_.reset(new WebLayerTreeViewImpl( |
612 global_state()->compositor_thread(), | 612 global_state()->compositor_thread(), |
613 global_state()->gpu_memory_buffer_manager(), | 613 global_state()->gpu_memory_buffer_manager(), |
614 global_state()->raster_thread_helper()->task_graph_runner(), | 614 global_state()->raster_thread_helper()->task_graph_runner(), |
615 surface.Pass(), gpu_service.Pass())); | 615 receiver.Pass(), gpu_service.Pass())); |
616 } | 616 } |
617 | 617 |
618 blink::WebLayerTreeView* HTMLFrame::layerTreeView() { | 618 blink::WebLayerTreeView* HTMLFrame::layerTreeView() { |
619 return web_layer_tree_view_impl_.get(); | 619 return web_layer_tree_view_impl_.get(); |
620 } | 620 } |
621 | 621 |
622 void HTMLFrame::resetInputMethod() { | 622 void HTMLFrame::resetInputMethod() { |
623 // When this method gets called, WebWidgetClient implementation should | 623 // When this method gets called, WebWidgetClient implementation should |
624 // reset the input method by cancelling any ongoing composition. | 624 // reset the input method by cancelling any ongoing composition. |
625 // TODO(penghuang): Reset IME. | 625 // TODO(penghuang): Reset IME. |
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
902 | 902 |
903 void HTMLFrame::reload(bool ignore_cache, bool is_client_redirect) { | 903 void HTMLFrame::reload(bool ignore_cache, bool is_client_redirect) { |
904 NOTIMPLEMENTED(); | 904 NOTIMPLEMENTED(); |
905 } | 905 } |
906 | 906 |
907 void HTMLFrame::forwardInputEvent(const blink::WebInputEvent* event) { | 907 void HTMLFrame::forwardInputEvent(const blink::WebInputEvent* event) { |
908 NOTIMPLEMENTED(); | 908 NOTIMPLEMENTED(); |
909 } | 909 } |
910 | 910 |
911 } // namespace mojo | 911 } // namespace mojo |
OLD | NEW |