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 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
144 #include "third_party/WebKit/public/platform/WebPoint.h" | 144 #include "third_party/WebKit/public/platform/WebPoint.h" |
145 #include "third_party/WebKit/public/platform/WebRect.h" | 145 #include "third_party/WebKit/public/platform/WebRect.h" |
146 #include "third_party/WebKit/public/platform/WebSize.h" | 146 #include "third_party/WebKit/public/platform/WebSize.h" |
147 #include "third_party/WebKit/public/platform/WebSocketStreamHandle.h" | 147 #include "third_party/WebKit/public/platform/WebSocketStreamHandle.h" |
148 #include "third_party/WebKit/public/platform/WebString.h" | 148 #include "third_party/WebKit/public/platform/WebString.h" |
149 #include "third_party/WebKit/public/platform/WebURL.h" | 149 #include "third_party/WebKit/public/platform/WebURL.h" |
150 #include "third_party/WebKit/public/platform/WebURLError.h" | 150 #include "third_party/WebKit/public/platform/WebURLError.h" |
151 #include "third_party/WebKit/public/platform/WebURLRequest.h" | 151 #include "third_party/WebKit/public/platform/WebURLRequest.h" |
152 #include "third_party/WebKit/public/platform/WebURLResponse.h" | 152 #include "third_party/WebKit/public/platform/WebURLResponse.h" |
153 #include "third_party/WebKit/public/platform/WebVector.h" | 153 #include "third_party/WebKit/public/platform/WebVector.h" |
154 #include "third_party/WebKit/public/web/WebAccessibilityObject.h" | 154 #include "third_party/WebKit/public/web/WebAXObject.h" |
155 #include "third_party/WebKit/public/web/WebColorName.h" | 155 #include "third_party/WebKit/public/web/WebColorName.h" |
156 #include "third_party/WebKit/public/web/WebDOMEvent.h" | 156 #include "third_party/WebKit/public/web/WebDOMEvent.h" |
157 #include "third_party/WebKit/public/web/WebDOMMessageEvent.h" | 157 #include "third_party/WebKit/public/web/WebDOMMessageEvent.h" |
158 #include "third_party/WebKit/public/web/WebDataSource.h" | 158 #include "third_party/WebKit/public/web/WebDataSource.h" |
159 #include "third_party/WebKit/public/web/WebDateTimeChooserCompletion.h" | 159 #include "third_party/WebKit/public/web/WebDateTimeChooserCompletion.h" |
160 #include "third_party/WebKit/public/web/WebDateTimeChooserParams.h" | 160 #include "third_party/WebKit/public/web/WebDateTimeChooserParams.h" |
161 #include "third_party/WebKit/public/web/WebDevToolsAgent.h" | 161 #include "third_party/WebKit/public/web/WebDevToolsAgent.h" |
162 #include "third_party/WebKit/public/web/WebDocument.h" | 162 #include "third_party/WebKit/public/web/WebDocument.h" |
163 #include "third_party/WebKit/public/web/WebElement.h" | 163 #include "third_party/WebKit/public/web/WebElement.h" |
164 #include "third_party/WebKit/public/web/WebFileChooserParams.h" | 164 #include "third_party/WebKit/public/web/WebFileChooserParams.h" |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
242 #if defined(ENABLE_PLUGINS) | 242 #if defined(ENABLE_PLUGINS) |
243 #include "content/renderer/npapi/webplugin_delegate_proxy.h" | 243 #include "content/renderer/npapi/webplugin_delegate_proxy.h" |
244 #include "content/renderer/npapi/webplugin_impl.h" | 244 #include "content/renderer/npapi/webplugin_impl.h" |
245 #include "content/renderer/pepper/pepper_browser_connection.h" | 245 #include "content/renderer/pepper/pepper_browser_connection.h" |
246 #include "content/renderer/pepper/pepper_plugin_instance_impl.h" | 246 #include "content/renderer/pepper/pepper_plugin_instance_impl.h" |
247 #include "content/renderer/pepper/pepper_plugin_registry.h" | 247 #include "content/renderer/pepper/pepper_plugin_registry.h" |
248 #include "content/renderer/pepper/pepper_webplugin_impl.h" | 248 #include "content/renderer/pepper/pepper_webplugin_impl.h" |
249 #include "content/renderer/pepper/plugin_module.h" | 249 #include "content/renderer/pepper/plugin_module.h" |
250 #endif | 250 #endif |
251 | 251 |
252 using WebKit::WebAccessibilityNotification; | 252 using WebKit::WebAXObject; |
253 using WebKit::WebAccessibilityObject; | |
254 using WebKit::WebApplicationCacheHost; | 253 using WebKit::WebApplicationCacheHost; |
255 using WebKit::WebApplicationCacheHostClient; | 254 using WebKit::WebApplicationCacheHostClient; |
256 using WebKit::WebCString; | 255 using WebKit::WebCString; |
257 using WebKit::WebColor; | 256 using WebKit::WebColor; |
258 using WebKit::WebColorName; | 257 using WebKit::WebColorName; |
259 using WebKit::WebConsoleMessage; | 258 using WebKit::WebConsoleMessage; |
260 using WebKit::WebContextMenuData; | 259 using WebKit::WebContextMenuData; |
261 using WebKit::WebCookieJar; | 260 using WebKit::WebCookieJar; |
262 using WebKit::WebData; | 261 using WebKit::WebData; |
263 using WebKit::WebDataSource; | 262 using WebKit::WebDataSource; |
(...skipping 2570 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2834 } | 2833 } |
2835 | 2834 |
2836 int RenderViewImpl::historyBackListCount() { | 2835 int RenderViewImpl::historyBackListCount() { |
2837 return history_list_offset_ < 0 ? 0 : history_list_offset_; | 2836 return history_list_offset_ < 0 ? 0 : history_list_offset_; |
2838 } | 2837 } |
2839 | 2838 |
2840 int RenderViewImpl::historyForwardListCount() { | 2839 int RenderViewImpl::historyForwardListCount() { |
2841 return history_list_length_ - historyBackListCount() - 1; | 2840 return history_list_length_ - historyBackListCount() - 1; |
2842 } | 2841 } |
2843 | 2842 |
2844 void RenderViewImpl::postAccessibilityNotification( | 2843 void RenderViewImpl::postAccessibilityEvent( |
2845 const WebAccessibilityObject& obj, | 2844 const WebAXObject& obj, WebKit::WebAXEvent event) { |
2846 WebAccessibilityNotification notification) { | |
2847 if (renderer_accessibility_) { | 2845 if (renderer_accessibility_) { |
2848 renderer_accessibility_->HandleWebAccessibilityNotification( | 2846 renderer_accessibility_->HandleWebAccessibilityEvent(obj, event); |
2849 obj, notification); | |
2850 } | 2847 } |
2851 } | 2848 } |
2852 | 2849 |
2853 void RenderViewImpl::didUpdateInspectorSetting(const WebString& key, | 2850 void RenderViewImpl::didUpdateInspectorSetting(const WebString& key, |
2854 const WebString& value) { | 2851 const WebString& value) { |
2855 Send(new ViewHostMsg_UpdateInspectorSetting(routing_id_, | 2852 Send(new ViewHostMsg_UpdateInspectorSetting(routing_id_, |
2856 key.utf8(), | 2853 key.utf8(), |
2857 value.utf8())); | 2854 value.utf8())); |
2858 } | 2855 } |
2859 | 2856 |
(...skipping 3660 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6520 for (size_t i = 0; i < icon_urls.size(); i++) { | 6517 for (size_t i = 0; i < icon_urls.size(); i++) { |
6521 WebURL url = icon_urls[i].iconURL(); | 6518 WebURL url = icon_urls[i].iconURL(); |
6522 if (!url.isEmpty()) | 6519 if (!url.isEmpty()) |
6523 urls.push_back(FaviconURL(url, | 6520 urls.push_back(FaviconURL(url, |
6524 ToFaviconType(icon_urls[i].iconType()))); | 6521 ToFaviconType(icon_urls[i].iconType()))); |
6525 } | 6522 } |
6526 SendUpdateFaviconURL(urls); | 6523 SendUpdateFaviconURL(urls); |
6527 } | 6524 } |
6528 | 6525 |
6529 } // namespace content | 6526 } // namespace content |
OLD | NEW |