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

third_party/WebKit/Source/web/FullscreenController.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 71 matching lines @@
   // Notify all local frames that we have entered fullscreen.
   for (Frame* frame = web_view_base_->GetPage()->MainFrame(); frame;
        frame = frame->Tree().TraverseNext()) {
     if (!frame->IsLocalFrame())
       continue;
     if (Document* document = ToLocalFrame(frame)->GetDocument()) {
       if (Fullscreen* fullscreen = Fullscreen::FromIfExists(*document))
         fullscreen->DidEnterFullscreen();
     }
   }
+
+  // TODO(foolip): If the top level browsing context (main frame) ends up with
+  // no fullscreen element, exit fullscreen again to recover.
 }
 
 void FullscreenController::DidExitFullscreen() {
   // The browser process can exit fullscreen at any time, e.g. if the user
   // presses Esc. After |Browser::EnterFullscreenModeForTab()|,
   // |Browser::ExitFullscreenModeForTab()| will make it seem like we exit when
   // not even in fullscreen. Do nothing.
   if (state_ == State::kInitial)
     return;
 
   UpdatePageScaleConstraints(true);
 
-  // Set |m_state| so that any |exitFullscreen()| calls from within
-  // |Fullscreen::didExitFullscreen()| do not call
-  // |WebFrameClient::exitFullscreen()| again.
-  // TODO(foolip): Remove this when state changes and events are synchronized
-  // with animation frames. https://crbug.com/402376
-  state_ = State::kExitingFullscreen;
-
-  // Notify all local frames that we have exited fullscreen.
-  // TODO(foolip): This should only need to notify the topmost local roots. That
-  // doesn't currently work because |Fullscreen::m_currentFullScreenElement|
-  // isn't set for the topmost document when an iframe goes fullscreen, but can
-  // be done once |m_currentFullScreenElement| is gone and all state is in the
-  // fullscreen element stack. https://crbug.com/402421
-  for (Frame* frame = web_view_base_->GetPage()->MainFrame(); frame;
-       frame = frame->Tree().TraverseNext()) {
-    if (!frame->IsLocalFrame())
-      continue;
-    if (Document* document = ToLocalFrame(frame)->GetDocument()) {
-      if (Fullscreen* fullscreen = Fullscreen::FromIfExists(*document))
-        fullscreen->DidExitFullscreen();
-    }
-  }
-
   // We need to wait until style and layout are updated in order to properly
   // restore scroll offsets since content may not be overflowing in the same way
   // until they are.
   state_ = State::kNeedsScrollAndScaleRestore;
+
+  // Notify the topmost local frames that we have exited fullscreen.
+  // |Fullscreen::didExitFullscreen()| will take care of descendant frames.
+  for (Frame* frame = web_view_base_->GetPage()->MainFrame(); frame;) {
+    Frame* next_frame = frame->Tree().TraverseNext();
+
+    if (frame->IsRemoteFrame()) {
+      frame = next_frame;
+      continue;
+    }
+
+    DCHECK(frame->IsLocalRoot());
+    if (Document* document = ToLocalFrame(frame)->GetDocument()) {
+      if (Fullscreen* fullscreen = Fullscreen::FromIfExists(*document))
+        fullscreen->DidExitFullscreen();
+    }
+
+    // Skip over all descendant frames.
+    while (next_frame && next_frame->Tree().IsDescendantOf(frame))
+      next_frame = next_frame->Tree().TraverseNext();
+    frame = next_frame;
+  }
 }
 
 void FullscreenController::EnterFullscreen(LocalFrame& frame) {
   // If already fullscreen or exiting fullscreen, synchronously call
   // |didEnterFullscreen()|. When exiting, the coming |didExitFullscren()| call
   // will again notify all frames.
   if (state_ == State::kFullscreen || state_ == State::kExitingFullscreen) {
     State old_state = state_;
     state_ = State::kEnteringFullscreen;
     DidEnterFullscreen();
@@ skipping 45 matching lines @@
 
 void FullscreenController::FullscreenElementChanged(Element* from_element,
                                                     Element* to_element) {
   DCHECK_NE(from_element, to_element);
 
   // We only override the WebView's background color for overlay fullscreen
   // video elements, so have to restore the override when the element changes.
   RestoreBackgroundColorOverride();
 
   if (to_element) {
-    DCHECK(Fullscreen::IsCurrentFullScreenElement(*to_element));
+    DCHECK(Fullscreen::IsFullscreenElement(*to_element));
 
     if (isHTMLVideoElement(*to_element)) {
       HTMLVideoElement& video_element = toHTMLVideoElement(*to_element);
       video_element.DidEnterFullscreen();
 
       // If the video uses overlay fullscreen mode, make the background
       // transparent.
       if (video_element.UsesOverlayFullscreenVideo())
         web_view_base_->SetBackgroundColorOverride(Color::kTransparent);
     }
   }
 
   if (from_element) {
-    DCHECK(!Fullscreen::IsCurrentFullScreenElement(*from_element));
+    DCHECK(!Fullscreen::IsFullscreenElement(*from_element));
 
     if (isHTMLVideoElement(*from_element)) {
       HTMLVideoElement& video_element = toHTMLVideoElement(*from_element);
       video_element.DidExitFullscreen();
     }
   }
 }
 
 void FullscreenController::RestoreBackgroundColorOverride() {
   if (web_view_base_->BackgroundColorOverrideEnabled() !=
@@ skipping 65 matching lines @@
   // again to ensure the final constraints pick up the latest contents size.
   web_view_base_->DidChangeContentsSize();
   if (web_view_base_->MainFrameImpl() &&
       web_view_base_->MainFrameImpl()->GetFrameView())
     web_view_base_->MainFrameImpl()->GetFrameView()->SetNeedsLayout();
 
   web_view_base_->UpdateMainFrameLayoutSize();
 }
 
 }  // namespace blink