Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / RenderFullScreen.cpp

diff --git a/src/third_party/WebKit/Source/core/rendering/RenderFullScreen.cpp b/src/third_party/WebKit/Source/core/rendering/RenderFullScreen.cpp
index 41c5ece..39f9c11 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/RenderFullScreen.cpp
+++ b/src/third_party/WebKit/Source/core/rendering/RenderFullScreen.cpp
@@ -25,7 +25,7 @@
 #include "config.h"
 #include "core/rendering/RenderFullScreen.h"
 
-#include "core/dom/FullscreenElementStack.h"
+#include "core/dom/Fullscreen.h"
 #include "core/rendering/RenderBlockFlow.h"
 
 using namespace blink;
@@ -47,7 +47,7 @@ private:
 void RenderFullScreenPlaceholder::willBeDestroyed()
 {
     m_owner->setPlaceholder(0);
-    RenderBlock::willBeDestroyed();
+    RenderBlockFlow::willBeDestroyed();
 }
 
 RenderFullScreen::RenderFullScreen()
@@ -81,7 +81,7 @@ void RenderFullScreen::willBeDestroyed()
 
     // RenderObjects are unretained, so notify the document (which holds a pointer to a RenderFullScreen)
     // if its RenderFullScreen is destroyed.
-    FullscreenElementStack& fullscreen = FullscreenElementStack::from(document());
+    Fullscreen& fullscreen = Fullscreen::from(document());
     if (fullscreen.fullScreenRenderer() == this)
         fullscreen.fullScreenRendererDestroyed();
 
@@ -150,7 +150,7 @@ RenderObject* RenderFullScreen::wrapRenderer(RenderObject* object, RenderObject*
     }
 
     ASSERT(document);
-    FullscreenElementStack::from(*document).setFullScreenRenderer(fullscreenRenderer);
+    Fullscreen::from(*document).setFullScreenRenderer(fullscreenRenderer);
     return fullscreenRenderer;
 }