| 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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 143 #include "third_party/WebKit/public/platform/WebPoint.h" | 143 #include "third_party/WebKit/public/platform/WebPoint.h" |
| 144 #include "third_party/WebKit/public/platform/WebRect.h" | 144 #include "third_party/WebKit/public/platform/WebRect.h" |
| 145 #include "third_party/WebKit/public/platform/WebSize.h" | 145 #include "third_party/WebKit/public/platform/WebSize.h" |
| 146 #include "third_party/WebKit/public/platform/WebSocketStreamHandle.h" | 146 #include "third_party/WebKit/public/platform/WebSocketStreamHandle.h" |
| 147 #include "third_party/WebKit/public/platform/WebString.h" | 147 #include "third_party/WebKit/public/platform/WebString.h" |
| 148 #include "third_party/WebKit/public/platform/WebURL.h" | 148 #include "third_party/WebKit/public/platform/WebURL.h" |
| 149 #include "third_party/WebKit/public/platform/WebURLError.h" | 149 #include "third_party/WebKit/public/platform/WebURLError.h" |
| 150 #include "third_party/WebKit/public/platform/WebURLRequest.h" | 150 #include "third_party/WebKit/public/platform/WebURLRequest.h" |
| 151 #include "third_party/WebKit/public/platform/WebURLResponse.h" | 151 #include "third_party/WebKit/public/platform/WebURLResponse.h" |
| 152 #include "third_party/WebKit/public/platform/WebVector.h" | 152 #include "third_party/WebKit/public/platform/WebVector.h" |
| 153 #include "third_party/WebKit/public/web/WebAccessibilityObject.h" | 153 #include "third_party/WebKit/public/web/WebAXObject.h" |
| 154 #include "third_party/WebKit/public/web/WebColorName.h" | 154 #include "third_party/WebKit/public/web/WebColorName.h" |
| 155 #include "third_party/WebKit/public/web/WebDOMEvent.h" | 155 #include "third_party/WebKit/public/web/WebDOMEvent.h" |
| 156 #include "third_party/WebKit/public/web/WebDOMMessageEvent.h" | 156 #include "third_party/WebKit/public/web/WebDOMMessageEvent.h" |
| 157 #include "third_party/WebKit/public/web/WebDataSource.h" | 157 #include "third_party/WebKit/public/web/WebDataSource.h" |
| 158 #include "third_party/WebKit/public/web/WebDateTimeChooserCompletion.h" | 158 #include "third_party/WebKit/public/web/WebDateTimeChooserCompletion.h" |
| 159 #include "third_party/WebKit/public/web/WebDateTimeChooserParams.h" | 159 #include "third_party/WebKit/public/web/WebDateTimeChooserParams.h" |
| 160 #include "third_party/WebKit/public/web/WebDevToolsAgent.h" | 160 #include "third_party/WebKit/public/web/WebDevToolsAgent.h" |
| 161 #include "third_party/WebKit/public/web/WebDocument.h" | 161 #include "third_party/WebKit/public/web/WebDocument.h" |
| 162 #include "third_party/WebKit/public/web/WebElement.h" | 162 #include "third_party/WebKit/public/web/WebElement.h" |
| 163 #include "third_party/WebKit/public/web/WebFileChooserParams.h" | 163 #include "third_party/WebKit/public/web/WebFileChooserParams.h" |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 241 #if defined(ENABLE_PLUGINS) | 241 #if defined(ENABLE_PLUGINS) |
| 242 #include "content/renderer/npapi/webplugin_delegate_proxy.h" | 242 #include "content/renderer/npapi/webplugin_delegate_proxy.h" |
| 243 #include "content/renderer/npapi/webplugin_impl.h" | 243 #include "content/renderer/npapi/webplugin_impl.h" |
| 244 #include "content/renderer/pepper/pepper_browser_connection.h" | 244 #include "content/renderer/pepper/pepper_browser_connection.h" |
| 245 #include "content/renderer/pepper/pepper_plugin_instance_impl.h" | 245 #include "content/renderer/pepper/pepper_plugin_instance_impl.h" |
| 246 #include "content/renderer/pepper/pepper_plugin_registry.h" | 246 #include "content/renderer/pepper/pepper_plugin_registry.h" |
| 247 #include "content/renderer/pepper/pepper_webplugin_impl.h" | 247 #include "content/renderer/pepper/pepper_webplugin_impl.h" |
| 248 #include "content/renderer/pepper/plugin_module.h" | 248 #include "content/renderer/pepper/plugin_module.h" |
| 249 #endif | 249 #endif |
| 250 | 250 |
| 251 using WebKit::WebAccessibilityNotification; | 251 using WebKit::WebAXObject; |
| 252 using WebKit::WebAccessibilityObject; | |
| 253 using WebKit::WebApplicationCacheHost; | 252 using WebKit::WebApplicationCacheHost; |
| 254 using WebKit::WebApplicationCacheHostClient; | 253 using WebKit::WebApplicationCacheHostClient; |
| 255 using WebKit::WebCString; | 254 using WebKit::WebCString; |
| 256 using WebKit::WebColor; | 255 using WebKit::WebColor; |
| 257 using WebKit::WebColorName; | 256 using WebKit::WebColorName; |
| 258 using WebKit::WebConsoleMessage; | 257 using WebKit::WebConsoleMessage; |
| 259 using WebKit::WebContextMenuData; | 258 using WebKit::WebContextMenuData; |
| 260 using WebKit::WebCookieJar; | 259 using WebKit::WebCookieJar; |
| 261 using WebKit::WebData; | 260 using WebKit::WebData; |
| 262 using WebKit::WebDataSource; | 261 using WebKit::WebDataSource; |
| (...skipping 2559 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2822 } | 2821 } |
| 2823 | 2822 |
| 2824 int RenderViewImpl::historyBackListCount() { | 2823 int RenderViewImpl::historyBackListCount() { |
| 2825 return history_list_offset_ < 0 ? 0 : history_list_offset_; | 2824 return history_list_offset_ < 0 ? 0 : history_list_offset_; |
| 2826 } | 2825 } |
| 2827 | 2826 |
| 2828 int RenderViewImpl::historyForwardListCount() { | 2827 int RenderViewImpl::historyForwardListCount() { |
| 2829 return history_list_length_ - historyBackListCount() - 1; | 2828 return history_list_length_ - historyBackListCount() - 1; |
| 2830 } | 2829 } |
| 2831 | 2830 |
| 2832 void RenderViewImpl::postAccessibilityNotification( | 2831 void RenderViewImpl::postAccessibilityEvent( |
| 2833 const WebAccessibilityObject& obj, | 2832 const WebAXObject& obj, WebKit::WebAXEvent event) { |
| 2834 WebAccessibilityNotification notification) { | |
| 2835 if (renderer_accessibility_) { | 2833 if (renderer_accessibility_) { |
| 2836 renderer_accessibility_->HandleWebAccessibilityNotification( | 2834 renderer_accessibility_->HandleWebAccessibilityEvent(obj, event); |
| 2837 obj, notification); | |
| 2838 } | 2835 } |
| 2839 } | 2836 } |
| 2840 | 2837 |
| 2841 void RenderViewImpl::didUpdateInspectorSetting(const WebString& key, | 2838 void RenderViewImpl::didUpdateInspectorSetting(const WebString& key, |
| 2842 const WebString& value) { | 2839 const WebString& value) { |
| 2843 Send(new ViewHostMsg_UpdateInspectorSetting(routing_id_, | 2840 Send(new ViewHostMsg_UpdateInspectorSetting(routing_id_, |
| 2844 key.utf8(), | 2841 key.utf8(), |
| 2845 value.utf8())); | 2842 value.utf8())); |
| 2846 } | 2843 } |
| 2847 | 2844 |
| (...skipping 3683 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6531 for (size_t i = 0; i < icon_urls.size(); i++) { | 6528 for (size_t i = 0; i < icon_urls.size(); i++) { |
| 6532 WebURL url = icon_urls[i].iconURL(); | 6529 WebURL url = icon_urls[i].iconURL(); |
| 6533 if (!url.isEmpty()) | 6530 if (!url.isEmpty()) |
| 6534 urls.push_back(FaviconURL(url, | 6531 urls.push_back(FaviconURL(url, |
| 6535 ToFaviconType(icon_urls[i].iconType()))); | 6532 ToFaviconType(icon_urls[i].iconType()))); |
| 6536 } | 6533 } |
| 6537 SendUpdateFaviconURL(urls); | 6534 SendUpdateFaviconURL(urls); |
| 6538 } | 6535 } |
| 6539 | 6536 |
| 6540 } // namespace content | 6537 } // namespace content |
| OLD | NEW |