| Index: content/renderer/pepper/pepper_plugin_instance_impl.cc
|
| diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc
|
| index 3611cee214702277db147357bdf6b4b923edaaaf..e7ce28114a098dfcc62dced904566915896f246e 100644
|
| --- a/content/renderer/pepper/pepper_plugin_instance_impl.cc
|
| +++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc
|
| @@ -3187,7 +3187,11 @@ void PepperPluginInstanceImpl::DoSetCursor(WebCursorInfo* cursor) {
|
| bool PepperPluginInstanceImpl::IsFullPagePlugin() {
|
| WebLocalFrame* frame = container()->GetDocument().GetFrame();
|
| return frame->View()->MainFrame()->IsWebLocalFrame() &&
|
| - frame->View()->MainFrame()->GetDocument().IsPluginDocument();
|
| + frame->View()
|
| + ->MainFrame()
|
| + ->ToWebLocalFrame()
|
| + ->GetDocument()
|
| + .IsPluginDocument();
|
| }
|
|
|
| bool PepperPluginInstanceImpl::FlashSetFullscreen(bool fullscreen,
|
| @@ -3316,11 +3320,11 @@ bool PepperPluginInstanceImpl::CanAccessMainFrame() const {
|
| !containing_document.GetFrame()->View()->MainFrame()) {
|
| return false;
|
| }
|
| - blink::WebDocument main_document =
|
| - containing_document.GetFrame()->View()->MainFrame()->GetDocument();
|
| + blink::WebFrame* main_frame =
|
| + containing_document.GetFrame()->View()->MainFrame();
|
|
|
| return containing_document.GetSecurityOrigin().CanAccess(
|
| - main_document.GetSecurityOrigin());
|
| + main_frame->GetSecurityOrigin());
|
| }
|
|
|
| void PepperPluginInstanceImpl::KeepSizeAttributesBeforeFullscreen() {
|
|
|