summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webplugin_impl.cc
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-06 21:08:35 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-06 21:08:35 +0000
commit71ed35fc7ef44f4279a2a65db0e638cc2cc440b9 (patch)
tree050b6d19c833784537c3fa1919afa2e514116511 /webkit/glue/webplugin_impl.cc
parentf6d426fc52a90ad2dd55e1847aa7212a5bc918bf (diff)
downloadchromium_src-71ed35fc7ef44f4279a2a65db0e638cc2cc440b9.zip
chromium_src-71ed35fc7ef44f4279a2a65db0e638cc2cc440b9.tar.gz
chromium_src-71ed35fc7ef44f4279a2a65db0e638cc2cc440b9.tar.bz2
There are cases where a Frame may outlive its associated Page. Get the
WebViewImpl by accessing it indirectly through the Frame's Page so that we don't have to worry about cleaning up the WebFrameImpl -> WebViewImpl pointer. WebCore already clears the Frame's Page pointer when the Page is destroyed by the WebViewImpl. Patch by Marshall Greenblatt R=darin Review: http://codereview.chromium.org/99283 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15458 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webplugin_impl.cc')
-rw-r--r--webkit/glue/webplugin_impl.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc
index 306a9a9..a065e59 100644
--- a/webkit/glue/webplugin_impl.cc
+++ b/webkit/glue/webplugin_impl.cc
@@ -640,7 +640,7 @@ void WebPluginImpl::setFrameRect(const WebCore::IntRect& rect) {
// containing window. We ask our delegate to reposition us accordingly.
WebCore::Frame* frame = element_->document()->frame();
WebFrameImpl* webframe = WebFrameImpl::FromFrame(frame);
- WebViewImpl* webview = webframe->webview_impl();
+ WebViewImpl* webview = webframe->GetWebViewImpl();
// It is valid for this function to be invoked in code paths where the
// the webview is closed.
if (!webview->delegate()) {
@@ -1325,7 +1325,7 @@ bool WebPluginImpl::ReinitializePluginForResponse(
if (!web_frame)
return false;
- WebViewImpl* web_view = web_frame->webview_impl();
+ WebViewImpl* web_view = web_frame->GetWebViewImpl();
if (!web_view)
return false;