Commit 7c55c111 authored by philipj@opera.com's avatar philipj@opera.com

Stop using controller as a variable name for FullscreenElementStack

This was probably originally FullscreenController.

Also fix a typo and simplify isActiveFullScreenElement.

Review URL: https://codereview.chromium.org/421693003

git-svn-id: svn://svn.chromium.org/blink/trunk@179009 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent e068bace
......@@ -124,10 +124,10 @@ private:
inline bool FullscreenElementStack::isActiveFullScreenElement(const Element& element)
{
FullscreenElementStack* controller = fromIfExists(element.document());
if (!controller)
FullscreenElementStack* fullscreen = fromIfExists(element.document());
if (!fullscreen)
return false;
return controller->webkitIsFullScreen() && controller->webkitCurrentFullScreenElement() == element;
return fullscreen->webkitCurrentFullScreenElement() == &element;
}
inline FullscreenElementStack* FullscreenElementStack::fromIfExists(Document& document)
......
......@@ -74,10 +74,10 @@ void RenderFullScreen::willBeDestroyed()
}
// RenderObjects are unretained, so notify the document (which holds a pointer to a RenderFullScreen)
// if it's RenderFullScreen is destroyed.
FullscreenElementStack& controller = FullscreenElementStack::from(document());
if (controller.fullScreenRenderer() == this)
controller.fullScreenRendererDestroyed();
// if its RenderFullScreen is destroyed.
FullscreenElementStack& fullscreen = FullscreenElementStack::from(document());
if (fullscreen.fullScreenRenderer() == this)
fullscreen.fullScreenRendererDestroyed();
RenderFlexibleBox::willBeDestroyed();
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment