Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Unified Diff: third_party/WebKit/Source/web/FullscreenController.cpp

Issue 2021513002: Move willEnterFullscreen to WebRemoteFrame. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add comment about user gestures Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/web/FullscreenController.cpp
diff --git a/third_party/WebKit/Source/web/FullscreenController.cpp b/third_party/WebKit/Source/web/FullscreenController.cpp
index 5901e61b352d1e4e110529b74d9d2f9cf2134ac9..9c2c1ead5c42f15b069c47c2340d5ab0e324439f 100644
--- a/third_party/WebKit/Source/web/FullscreenController.cpp
+++ b/third_party/WebKit/Source/web/FullscreenController.cpp
@@ -56,7 +56,6 @@ FullscreenController::FullscreenController(WebViewImpl* webViewImpl)
: m_webViewImpl(webViewImpl)
, m_haveEnteredFullscreen(false)
, m_exitFullscreenPageScaleFactor(0)
- , m_fullscreenIsForCrossProcessAncestor(false)
, m_isCancelingFullScreen(false)
{
}
@@ -82,7 +81,7 @@ void FullscreenController::didEnterFullScreen()
m_haveEnteredFullscreen = true;
}
- Fullscreen::from(document).didEnterFullScreenForElement(element, m_fullscreenIsForCrossProcessAncestor);
+ Fullscreen::from(document).didEnterFullScreenForElement(element);
DCHECK_EQ(Fullscreen::currentFullScreenElementFrom(document), element);
if (isHTMLVideoElement(element)) {
@@ -120,8 +119,7 @@ void FullscreenController::didExitFullScreen()
m_haveEnteredFullscreen = false;
}
- fullscreen->didExitFullScreenForElement(m_fullscreenIsForCrossProcessAncestor);
- m_fullscreenIsForCrossProcessAncestor = false;
+ fullscreen->didExitFullScreenForElement();
}
}
}
@@ -156,7 +154,7 @@ void FullscreenController::enterFullScreenForElement(Element* element)
// We need to transition to fullscreen mode.
WebLocalFrameImpl* frame = WebLocalFrameImpl::fromFrame(element->document().frame());
if (frame && frame->client()) {
- if (!m_fullscreenIsForCrossProcessAncestor)
+ if (!Fullscreen::from(element->document()).forCrossProcessAncestor())
frame->client()->enterFullscreen();
m_provisionalFullScreenElement = element;
}
« no previous file with comments | « third_party/WebKit/Source/web/FullscreenController.h ('k') | third_party/WebKit/Source/web/WebRemoteFrameImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698