| 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 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMMessageEvent.h" | 109 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMMessageEvent.h" |
| 110 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h" | 110 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h" |
| 111 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" | 111 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" |
| 112 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" | 112 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" |
| 113 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileChooserParams.
h" | 113 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileChooserParams.
h" |
| 114 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallback
s.h" | 114 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallback
s.h" |
| 115 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFindOptions.h" | 115 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFindOptions.h" |
| 116 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormControlElement
.h" | 116 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormControlElement
.h" |
| 117 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormElement.h" | 117 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormElement.h" |
| 118 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" | 118 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" |
| 119 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHelperPlugin.h" |
| 119 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h" | 120 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h" |
| 120 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h" | 121 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h" |
| 121 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" | 122 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" |
| 122 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIntent.h" | 123 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIntent.h" |
| 123 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIntentRequest.h" | 124 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIntentRequest.h" |
| 124 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIntentServiceInfo.
h" | 125 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIntentServiceInfo.
h" |
| 125 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerAction.
h" | 126 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerAction.
h" |
| 126 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMessagePortChannel
.h" | 127 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMessagePortChannel
.h" |
| 127 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNodeList.h" | 128 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNodeList.h" |
| 128 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPageSerializer.h" | 129 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPageSerializer.h" |
| (...skipping 1670 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1799 const WebString& path, | 1800 const WebString& path, |
| 1800 WebFileChooserCompletion* chooser_completion) { | 1801 WebFileChooserCompletion* chooser_completion) { |
| 1801 int id = enumeration_completion_id_++; | 1802 int id = enumeration_completion_id_++; |
| 1802 enumeration_completions_[id] = chooser_completion; | 1803 enumeration_completions_[id] = chooser_completion; |
| 1803 return Send(new ViewHostMsg_EnumerateDirectory( | 1804 return Send(new ViewHostMsg_EnumerateDirectory( |
| 1804 routing_id_, | 1805 routing_id_, |
| 1805 id, | 1806 id, |
| 1806 webkit_glue::WebStringToFilePath(path))); | 1807 webkit_glue::WebStringToFilePath(path))); |
| 1807 } | 1808 } |
| 1808 | 1809 |
| 1810 void RenderViewImpl::initializeHelperPluginWebFrame( |
| 1811 WebKit::WebHelperPlugin* plugin) { |
| 1812 plugin->initializeFrame(this); |
| 1813 } |
| 1814 |
| 1809 void RenderViewImpl::didStartLoading() { | 1815 void RenderViewImpl::didStartLoading() { |
| 1810 if (is_loading_) { | 1816 if (is_loading_) { |
| 1811 DVLOG(1) << "didStartLoading called while loading"; | 1817 DVLOG(1) << "didStartLoading called while loading"; |
| 1812 return; | 1818 return; |
| 1813 } | 1819 } |
| 1814 | 1820 |
| 1815 is_loading_ = true; | 1821 is_loading_ = true; |
| 1816 | 1822 |
| 1817 Send(new ViewHostMsg_DidStartLoading(routing_id_)); | 1823 Send(new ViewHostMsg_DidStartLoading(routing_id_)); |
| 1818 | 1824 |
| (...skipping 3851 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5670 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { | 5676 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { |
| 5671 return !!RenderThreadImpl::current()->compositor_thread(); | 5677 return !!RenderThreadImpl::current()->compositor_thread(); |
| 5672 } | 5678 } |
| 5673 | 5679 |
| 5674 void RenderViewImpl::OnJavaBridgeInit() { | 5680 void RenderViewImpl::OnJavaBridgeInit() { |
| 5675 DCHECK(!java_bridge_dispatcher_); | 5681 DCHECK(!java_bridge_dispatcher_); |
| 5676 #if defined(ENABLE_JAVA_BRIDGE) | 5682 #if defined(ENABLE_JAVA_BRIDGE) |
| 5677 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); | 5683 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); |
| 5678 #endif | 5684 #endif |
| 5679 } | 5685 } |
| OLD | NEW |