Add a requestFullscreen variant with a default (prefixed) type

third_party/WebKit/Source/web/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 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 7677 matching lines @@
   client.m_screenInfo.rect.height = viewportHeight;
   WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(
       m_baseURL + "fullscreen_div.html", true, nullptr, &client, nullptr,
       configureAndroid);
   webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
   webViewImpl->updateAllLifecyclePhases();
 
   Document* document = webViewImpl->mainFrameImpl()->frame()->document();
   UserGestureIndicator gesture(DocumentUserGestureToken::create(document));
   Element* divFullscreen = document->getElementById("div1");
-  Fullscreen::requestFullscreen(*divFullscreen, Fullscreen::PrefixedRequest);
+  Fullscreen::requestFullscreen(*divFullscreen);
   EXPECT_EQ(nullptr, Fullscreen::currentFullScreenElementFrom(*document));
   EXPECT_EQ(divFullscreen, Fullscreen::fullscreenElementFrom(*document));
   webViewImpl->didEnterFullscreen();
   EXPECT_EQ(divFullscreen, Fullscreen::currentFullScreenElementFrom(*document));
   EXPECT_EQ(divFullscreen, Fullscreen::fullscreenElementFrom(*document));
   webViewImpl->updateAllLifecyclePhases();
   EXPECT_EQ(divFullscreen, Fullscreen::currentFullScreenElementFrom(*document));
   EXPECT_EQ(divFullscreen, Fullscreen::fullscreenElementFrom(*document));
 
   // Verify that the element is sized to the viewport.
@@ skipping 19 matching lines @@
   int viewportHeight = 480;
   WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(
       m_baseURL + "fullscreen_div.html", true, nullptr, &client, nullptr,
       configureAndroid);
   webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
   webViewImpl->updateAllLifecyclePhases();
 
   Document* document = webViewImpl->mainFrameImpl()->frame()->document();
   UserGestureIndicator gesture(DocumentUserGestureToken::create(document));
   Element* divFullscreen = document->getElementById("div1");
-  Fullscreen::requestFullscreen(*divFullscreen, Fullscreen::PrefixedRequest);
+  Fullscreen::requestFullscreen(*divFullscreen);
   EXPECT_EQ(nullptr, Fullscreen::currentFullScreenElementFrom(*document));
   EXPECT_EQ(divFullscreen, Fullscreen::fullscreenElementFrom(*document));
   webViewImpl->didEnterFullscreen();
   EXPECT_EQ(divFullscreen, Fullscreen::currentFullScreenElementFrom(*document));
   EXPECT_EQ(divFullscreen, Fullscreen::fullscreenElementFrom(*document));
   webViewImpl->updateAllLifecyclePhases();
   EXPECT_EQ(divFullscreen, Fullscreen::currentFullScreenElementFrom(*document));
   EXPECT_EQ(divFullscreen, Fullscreen::fullscreenElementFrom(*document));
 
   // Verify that the viewports are nonscrollable.
@@ skipping 32 matching lines @@
   int viewportWidth = 640;
   int viewportHeight = 480;
   WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(
       m_baseURL + "fullscreen_div.html", true, nullptr, &client, nullptr,
       configureAndroid);
   webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
   webViewImpl->updateAllLifecyclePhases();
 
   Document* document = webViewImpl->mainFrameImpl()->frame()->document();
   UserGestureIndicator gesture(DocumentUserGestureToken::create(document));
-  Fullscreen::requestFullscreen(*document->documentElement(),
-                                Fullscreen::PrefixedRequest);
+  Fullscreen::requestFullscreen(*document->documentElement());
   EXPECT_EQ(nullptr, Fullscreen::currentFullScreenElementFrom(*document));
   EXPECT_EQ(document->documentElement(),
             Fullscreen::fullscreenElementFrom(*document));
   webViewImpl->didEnterFullscreen();
   EXPECT_EQ(document->documentElement(),
             Fullscreen::currentFullScreenElementFrom(*document));
   EXPECT_EQ(document->documentElement(),
             Fullscreen::fullscreenElementFrom(*document));
 
   webViewImpl->updateAllLifecyclePhases();
@@ skipping 30 matching lines @@
   client.m_screenInfo.rect.height = viewportHeight;
   webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
   webViewImpl->updateAllLifecyclePhases();
 
   Document* document =
       toWebLocalFrameImpl(webViewHelper.webView()->mainFrame()->firstChild())
           ->frame()
           ->document();
   UserGestureIndicator gesture(DocumentUserGestureToken::create(document));
   Element* divFullscreen = document->getElementById("div1");
-  Fullscreen::requestFullscreen(*divFullscreen, Fullscreen::PrefixedRequest);
+  Fullscreen::requestFullscreen(*divFullscreen);
   webViewImpl->didEnterFullscreen();
   webViewImpl->updateAllLifecyclePhases();
 
   // Verify that the element is sized to the viewport.
   LayoutFullScreen* fullscreenLayoutObject =
       Fullscreen::from(*document).fullScreenLayoutObject();
   EXPECT_EQ(viewportWidth, fullscreenLayoutObject->logicalWidth().toInt());
   EXPECT_EQ(viewportHeight, fullscreenLayoutObject->logicalHeight().toInt());
 
   // Verify it's updated after a device rotation.
@@ skipping 19 matching lines @@
   Document* topDoc = webViewImpl->mainFrameImpl()->frame()->document();
   Element* topBody = topDoc->body();
 
   HTMLIFrameElement* iframe =
       toHTMLIFrameElement(topDoc->querySelector("iframe"));
   Document* iframeDoc = iframe->contentDocument();
   Element* iframeBody = iframeDoc->body();
 
   {
     UserGestureIndicator gesture(DocumentUserGestureToken::create(topDoc));
-    Fullscreen::requestFullscreen(*topBody, Fullscreen::PrefixedRequest);
+    Fullscreen::requestFullscreen(*topBody);
   }
   webViewImpl->didEnterFullscreen();
   webViewImpl->updateAllLifecyclePhases();
 
   {
     UserGestureIndicator gesture(DocumentUserGestureToken::create(iframeDoc));
-    Fullscreen::requestFullscreen(*iframeBody, Fullscreen::PrefixedRequest);
+    Fullscreen::requestFullscreen(*iframeBody);
   }
   webViewImpl->didEnterFullscreen();
   webViewImpl->updateAllLifecyclePhases();
 
   // We are now in nested fullscreen, with both documents having a non-empty
   // fullscreen element stack.
   EXPECT_EQ(topBody, Fullscreen::currentFullScreenElementFrom(*topDoc));
   EXPECT_EQ(iframe, Fullscreen::fullscreenElementFrom(*topDoc));
   EXPECT_EQ(iframeBody, Fullscreen::currentFullScreenElementFrom(*iframeDoc));
   EXPECT_EQ(iframeBody, Fullscreen::fullscreenElementFrom(*iframeDoc));
@@ skipping 25 matching lines @@
   LayoutViewItem layoutViewItem =
       webViewHelper.webView()->mainFrameImpl()->frameView()->layoutViewItem();
   EXPECT_EQ(320, layoutViewItem.logicalWidth().floor());
   EXPECT_EQ(533, layoutViewItem.logicalHeight().floor());
   EXPECT_FLOAT_EQ(1.2, webViewImpl->pageScaleFactor());
   EXPECT_FLOAT_EQ(1.2, webViewImpl->minimumPageScaleFactor());
   EXPECT_FLOAT_EQ(5.0, webViewImpl->maximumPageScaleFactor());
 
   Document* document = webViewImpl->mainFrameImpl()->frame()->document();
   UserGestureIndicator gesture(DocumentUserGestureToken::create(document));
-  Fullscreen::requestFullscreen(*document->documentElement(),
-                                Fullscreen::PrefixedRequest);
+  Fullscreen::requestFullscreen(*document->documentElement());
   webViewImpl->didEnterFullscreen();
   webViewImpl->updateAllLifecyclePhases();
   EXPECT_EQ(384, layoutViewItem.logicalWidth().floor());
   EXPECT_EQ(640, layoutViewItem.logicalHeight().floor());
   EXPECT_FLOAT_EQ(1.0, webViewImpl->pageScaleFactor());
   EXPECT_FLOAT_EQ(1.0, webViewImpl->minimumPageScaleFactor());
   EXPECT_FLOAT_EQ(1.0, webViewImpl->maximumPageScaleFactor());
 
   webViewImpl->didExitFullscreen();
   webViewImpl->updateAllLifecyclePhases();
@@ skipping 15 matching lines @@
   int viewportHeight = 640;
   client.m_screenInfo.rect.width = viewportWidth;
   client.m_screenInfo.rect.height = viewportHeight;
   webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
   webViewImpl->updateAllLifecyclePhases();
 
   LayoutViewItem layoutViewItem =
       webViewHelper.webView()->mainFrameImpl()->frameView()->layoutViewItem();
   Document* document = webViewImpl->mainFrameImpl()->frame()->document();
   UserGestureIndicator gesture(DocumentUserGestureToken::create(document));
-  Fullscreen::requestFullscreen(*document->documentElement(),
-                                Fullscreen::PrefixedRequest);
+  Fullscreen::requestFullscreen(*document->documentElement());
   webViewImpl->didEnterFullscreen();
   webViewImpl->updateAllLifecyclePhases();
   EXPECT_EQ(384, layoutViewItem.logicalWidth().floor());
   EXPECT_EQ(640, layoutViewItem.logicalHeight().floor());
   EXPECT_FLOAT_EQ(1.0, webViewImpl->pageScaleFactor());
   EXPECT_FLOAT_EQ(1.0, webViewImpl->minimumPageScaleFactor());
   EXPECT_FLOAT_EQ(1.0, webViewImpl->maximumPageScaleFactor());
 
   viewportWidth = 640;
   viewportHeight = 384;
@@ skipping 40 matching lines @@
             layoutViewItem.logicalWidth().floor());
   EXPECT_EQ(screenSizeMinusStatusBarsMinusUrlBar.height,
             layoutViewItem.logicalHeight().floor());
   EXPECT_FLOAT_EQ(1.0, webViewImpl->pageScaleFactor());
   EXPECT_FLOAT_EQ(1.0, webViewImpl->minimumPageScaleFactor());
   EXPECT_FLOAT_EQ(5.0, webViewImpl->maximumPageScaleFactor());
 
   {
     Document* document = webViewImpl->mainFrameImpl()->frame()->document();
     UserGestureIndicator gesture(DocumentUserGestureToken::create(document));
-    Fullscreen::requestFullscreen(*document->body(),
-                                  Fullscreen::PrefixedRequest);
+    Fullscreen::requestFullscreen(*document->body());
   }
 
   webViewImpl->didEnterFullscreen();
   webViewImpl->updateAllLifecyclePhases();
   client.m_screenInfo.rect.width = screenSizeMinusStatusBars.width;
   client.m_screenInfo.rect.height = screenSizeMinusStatusBars.height;
   webViewHelper.resize(screenSizeMinusStatusBars);
   client.m_screenInfo.rect.width = screenSize.width;
   client.m_screenInfo.rect.height = screenSize.height;
   webViewHelper.resize(screenSize);
@@ skipping 40 matching lines @@
       webViewImpl->mainFrameImpl()->frameView()->layoutViewItem();
   EXPECT_EQ(320, layoutViewItem.logicalWidth().floor());
   EXPECT_EQ(640, layoutViewItem.logicalHeight().floor());
   EXPECT_FLOAT_EQ(0.3125, webViewImpl->pageScaleFactor());
   EXPECT_FLOAT_EQ(0.3125, webViewImpl->minimumPageScaleFactor());
   EXPECT_FLOAT_EQ(5.0, webViewImpl->maximumPageScaleFactor());
 
   Document* document = webViewImpl->mainFrameImpl()->frame()->document();
   UserGestureIndicator gesture(
       DocumentUserGestureToken::create(document, UserGestureToken::NewGesture));
-  Fullscreen::requestFullscreen(*document->documentElement(),
-                                Fullscreen::PrefixedRequest);
+  Fullscreen::requestFullscreen(*document->documentElement());
   webViewImpl->didEnterFullscreen();
   webViewImpl->updateAllLifecyclePhases();
 
   // Entering fullscreen causes layout size and page scale limits to be
   // overridden.
   EXPECT_EQ(100, layoutViewItem.logicalWidth().floor());
   EXPECT_EQ(200, layoutViewItem.logicalHeight().floor());
   EXPECT_FLOAT_EQ(1.0, webViewImpl->pageScaleFactor());
   EXPECT_FLOAT_EQ(1.0, webViewImpl->minimumPageScaleFactor());
   EXPECT_FLOAT_EQ(1.0, webViewImpl->maximumPageScaleFactor());
@@ skipping 48 matching lines @@
       webViewClient.testFullscreenLayerTreeView;
 
   Document* document = webViewImpl->mainFrameImpl()->frame()->document();
   UserGestureIndicator gesture(DocumentUserGestureToken::create(document));
   HTMLVideoElement* video =
       toHTMLVideoElement(document->getElementById("video"));
   EXPECT_TRUE(video->usesOverlayFullscreenVideo());
   EXPECT_FALSE(video->isFullscreen());
   EXPECT_FALSE(layerTreeView.hasTransparentBackground);
 
-  video->enterFullscreen();
+  video->webkitEnterFullscreen();
   webViewImpl->didEnterFullscreen();
   webViewImpl->updateAllLifecyclePhases();
   EXPECT_TRUE(video->isFullscreen());
   EXPECT_TRUE(layerTreeView.hasTransparentBackground);
 
   webViewImpl->didExitFullscreen();
   webViewImpl->updateAllLifecyclePhases();
   EXPECT_FALSE(video->isFullscreen());
   EXPECT_FALSE(layerTreeView.hasTransparentBackground);
 }
@@ skipping 2911 matching lines @@
 
   EXPECT_TRUE(mainFrameClient.childClient().didCallFrameDetached());
   EXPECT_TRUE(mainFrameClient.childClient().didCallDidStopLoading());
   EXPECT_TRUE(mainFrameClient.childClient().didCallDidFinishDocumentLoad());
   EXPECT_TRUE(mainFrameClient.childClient().didCallDidHandleOnloadEvents());
 
   webViewHelper.reset();
 }
 
 }  // namespace blink