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/bind.h" | 10 #include "base/bind.h" |
(...skipping 874 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
885 | 885 |
886 void RenderViewImpl::RemoveObserver(RenderViewObserver* observer) { | 886 void RenderViewImpl::RemoveObserver(RenderViewObserver* observer) { |
887 observer->RenderViewGone(); | 887 observer->RenderViewGone(); |
888 observers_.RemoveObserver(observer); | 888 observers_.RemoveObserver(observer); |
889 } | 889 } |
890 | 890 |
891 WebKit::WebView* RenderViewImpl::webview() const { | 891 WebKit::WebView* RenderViewImpl::webview() const { |
892 return static_cast<WebKit::WebView*>(webwidget()); | 892 return static_cast<WebKit::WebView*>(webwidget()); |
893 } | 893 } |
894 | 894 |
895 void RenderViewImpl::PluginCrashed(const FilePath& plugin_path) { | 895 void RenderViewImpl::PluginCrashed(const FilePath& plugin_path, |
896 Send(new ViewHostMsg_CrashedPlugin(routing_id_, plugin_path)); | 896 base::ProcessId plugin_pid) { |
| 897 Send(new ViewHostMsg_CrashedPlugin(routing_id_, plugin_path, plugin_pid)); |
897 } | 898 } |
898 | 899 |
899 void RenderViewImpl::RegisterPluginDelegate(WebPluginDelegateProxy* delegate) { | 900 void RenderViewImpl::RegisterPluginDelegate(WebPluginDelegateProxy* delegate) { |
900 plugin_delegates_.insert(delegate); | 901 plugin_delegates_.insert(delegate); |
901 // If the renderer is visible, set initial visibility and focus state. | 902 // If the renderer is visible, set initial visibility and focus state. |
902 if (!is_hidden()) { | 903 if (!is_hidden()) { |
903 #if defined(OS_MACOSX) | 904 #if defined(OS_MACOSX) |
904 delegate->SetContainerVisibility(true); | 905 delegate->SetContainerVisibility(true); |
905 if (webview() && webview()->isActive()) | 906 if (webview() && webview()->isActive()) |
906 delegate->SetWindowFocus(true); | 907 delegate->SetWindowFocus(true); |
(...skipping 5645 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6552 } | 6553 } |
6553 #endif | 6554 #endif |
6554 | 6555 |
6555 void RenderViewImpl::OnReleaseDisambiguationPopupDIB( | 6556 void RenderViewImpl::OnReleaseDisambiguationPopupDIB( |
6556 TransportDIB::Handle dib_handle) { | 6557 TransportDIB::Handle dib_handle) { |
6557 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); | 6558 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); |
6558 RenderProcess::current()->ReleaseTransportDIB(dib); | 6559 RenderProcess::current()->ReleaseTransportDIB(dib); |
6559 } | 6560 } |
6560 | 6561 |
6561 } // namespace content | 6562 } // namespace content |
OLD | NEW |