| 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 850 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 861 | 861 |
| 862 void RenderViewImpl::RemoveObserver(RenderViewObserver* observer) { | 862 void RenderViewImpl::RemoveObserver(RenderViewObserver* observer) { |
| 863 observer->RenderViewGone(); | 863 observer->RenderViewGone(); |
| 864 observers_.RemoveObserver(observer); | 864 observers_.RemoveObserver(observer); |
| 865 } | 865 } |
| 866 | 866 |
| 867 WebKit::WebView* RenderViewImpl::webview() const { | 867 WebKit::WebView* RenderViewImpl::webview() const { |
| 868 return static_cast<WebKit::WebView*>(webwidget()); | 868 return static_cast<WebKit::WebView*>(webwidget()); |
| 869 } | 869 } |
| 870 | 870 |
| 871 void RenderViewImpl::PluginCrashed(const FilePath& plugin_path) { | 871 void RenderViewImpl::PluginCrashed(const FilePath& plugin_path, |
| 872 Send(new ViewHostMsg_CrashedPlugin(routing_id_, plugin_path)); | 872 base::ProcessId plugin_pid) { |
| 873 Send(new ViewHostMsg_CrashedPlugin(routing_id_, plugin_path, plugin_pid)); |
| 873 } | 874 } |
| 874 | 875 |
| 875 void RenderViewImpl::RegisterPluginDelegate(WebPluginDelegateProxy* delegate) { | 876 void RenderViewImpl::RegisterPluginDelegate(WebPluginDelegateProxy* delegate) { |
| 876 plugin_delegates_.insert(delegate); | 877 plugin_delegates_.insert(delegate); |
| 877 // If the renderer is visible, set initial visibility and focus state. | 878 // If the renderer is visible, set initial visibility and focus state. |
| 878 if (!is_hidden()) { | 879 if (!is_hidden()) { |
| 879 #if defined(OS_MACOSX) | 880 #if defined(OS_MACOSX) |
| 880 delegate->SetContainerVisibility(true); | 881 delegate->SetContainerVisibility(true); |
| 881 if (webview() && webview()->isActive()) | 882 if (webview() && webview()->isActive()) |
| 882 delegate->SetWindowFocus(true); | 883 delegate->SetWindowFocus(true); |
| (...skipping 5623 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6506 } | 6507 } |
| 6507 #endif | 6508 #endif |
| 6508 | 6509 |
| 6509 void RenderViewImpl::OnReleaseDisambiguationPopupDIB( | 6510 void RenderViewImpl::OnReleaseDisambiguationPopupDIB( |
| 6510 TransportDIB::Handle dib_handle) { | 6511 TransportDIB::Handle dib_handle) { |
| 6511 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); | 6512 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); |
| 6512 RenderProcess::current()->ReleaseTransportDIB(dib); | 6513 RenderProcess::current()->ReleaseTransportDIB(dib); |
| 6513 } | 6514 } |
| 6514 | 6515 |
| 6515 } // namespace content | 6516 } // namespace content |
| OLD | NEW |