Reland "Sync requestFullscreen() and exitFullscreen() algorithms with the spec"

third_party/WebKit/Source/core/layout/LayoutInline.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc.
  *               All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 391 matching lines @@
                                 LayoutObject* before_child,
                                 LayoutBoxModelObject* old_cont) {
   DCHECK(IsDescendantOf(from_block));
 
   // If we're splitting the inline containing the fullscreened element,
   // |beforeChild| may be the layoutObject for the fullscreened element.
   // However, that layoutObject is wrapped in a LayoutFullScreen, so |this| is
   // not its parent. Since the splitting logic expects |this| to be the parent,
   // set |beforeChild| to be the LayoutFullScreen.
   if (Fullscreen* fullscreen = Fullscreen::FromIfExists(GetDocument())) {
-    const Element* full_screen_element = fullscreen->CurrentFullScreenElement();
-    if (full_screen_element && before_child &&
-        before_child->GetNode() == full_screen_element)
+    const Element* fullscreen_element = fullscreen->FullscreenElement();
+    if (fullscreen_element && before_child &&
+        before_child->GetNode() == fullscreen_element)
       before_child = fullscreen->FullScreenLayoutObject();
   }
 
   // FIXME: Because splitting is O(n^2) as tags nest pathologically, we cap the
   // depth at which we're willing to clone.
   // There will eventually be a better approach to this problem that will let us
   // nest to a much greater depth (see bugzilla bug 13430) but for now we have a
   // limit. This *will* result in incorrect rendering, but the alternative is to
   // hang forever.
   const unsigned kCMaxSplitDepth = 200;
@@ skipping 1126 matching lines @@
     paint_invalidator.InvalidateDisplayItemClient(*box, invalidation_reason);
 }
 
 // TODO(lunalu): Not to just dump 0, 0 as the x and y here
 LayoutRect LayoutInline::DebugRect() const {
   IntRect lines_box = EnclosingIntRect(LinesBoundingBox());
   return LayoutRect(IntRect(0, 0, lines_box.Width(), lines_box.Height()));
 }
 
 }  // namespace blink