| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/renderer/render_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 5669 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5680 &override_state)) | 5680 &override_state)) |
| 5681 return override_state; | 5681 return override_state; |
| 5682 return current_state; | 5682 return current_state; |
| 5683 } | 5683 } |
| 5684 | 5684 |
| 5685 WebKit::WebUserMediaClient* RenderViewImpl::userMediaClient() { | 5685 WebKit::WebUserMediaClient* RenderViewImpl::userMediaClient() { |
| 5686 EnsureMediaStreamImpl(); | 5686 EnsureMediaStreamImpl(); |
| 5687 return media_stream_impl_; | 5687 return media_stream_impl_; |
| 5688 } | 5688 } |
| 5689 | 5689 |
| 5690 void RenderViewImpl::draggableRegionsChanged() { |
| 5691 WebKit::WebVector<WebKit::WebDraggableRegion> webregions = |
| 5692 webview()->mainFrame()->document().draggableRegions(); |
| 5693 std::vector<content::DraggableRegion> regions; |
| 5694 for (size_t i = 0; i < webregions.size(); ++i) { |
| 5695 content::DraggableRegion region; |
| 5696 region.label = UTF16ToASCII(webregions[i].label); |
| 5697 region.bounds = webregions[i].bounds; |
| 5698 region.clip = webregions[i].clip; |
| 5699 regions.push_back(region); |
| 5700 } |
| 5701 Send(new ViewHostMsg_UpdateDraggableRegions(routing_id_, regions)); |
| 5702 } |
| 5703 |
| 5690 void RenderViewImpl::OnAsyncFileOpened( | 5704 void RenderViewImpl::OnAsyncFileOpened( |
| 5691 base::PlatformFileError error_code, | 5705 base::PlatformFileError error_code, |
| 5692 IPC::PlatformFileForTransit file_for_transit, | 5706 IPC::PlatformFileForTransit file_for_transit, |
| 5693 int message_id) { | 5707 int message_id) { |
| 5694 pepper_delegate_.OnAsyncFileOpened( | 5708 pepper_delegate_.OnAsyncFileOpened( |
| 5695 error_code, | 5709 error_code, |
| 5696 IPC::PlatformFileForTransitToPlatformFile(file_for_transit), | 5710 IPC::PlatformFileForTransitToPlatformFile(file_for_transit), |
| 5697 message_id); | 5711 message_id); |
| 5698 } | 5712 } |
| 5699 | 5713 |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5755 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { | 5769 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { |
| 5756 return !!RenderThreadImpl::current()->compositor_thread(); | 5770 return !!RenderThreadImpl::current()->compositor_thread(); |
| 5757 } | 5771 } |
| 5758 | 5772 |
| 5759 void RenderViewImpl::OnJavaBridgeInit() { | 5773 void RenderViewImpl::OnJavaBridgeInit() { |
| 5760 DCHECK(!java_bridge_dispatcher_); | 5774 DCHECK(!java_bridge_dispatcher_); |
| 5761 #if defined(ENABLE_JAVA_BRIDGE) | 5775 #if defined(ENABLE_JAVA_BRIDGE) |
| 5762 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); | 5776 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); |
| 5763 #endif | 5777 #endif |
| 5764 } | 5778 } |
| OLD | NEW |