<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[199733] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/199733">199733</a></dd>
<dt>Author</dt> <dd>adachan@apple.com</dd>
<dt>Date</dt> <dd>2016-04-19 10:58:57 -0700 (Tue, 19 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Context menu items related to fullscreen should be specific to standard fullscreen
https://bugs.webkit.org/show_bug.cgi?id=156723
<rdar://problem/25452632>
Reviewed by Darin Adler.
Introduce HTMLMediaElement::isStandardFullscreen() that the HitTestResult code can use
when handling the validation and selection of fullscreen-related context menu items.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::isStandardFullscreen):
(WebCore::HTMLMediaElement::toggleStandardFullscreenState):
Renamed to make it clear that it's for toggling standard fullscreen. Call the new
HTMLMediaElement::isStandardFullscreen().
* html/HTMLMediaElement.h:
* rendering/HitTestResult.cpp:
(WebCore::HitTestResult::mediaIsInFullscreen):
Use HTMLMediaElement::isStandardFullscreen().
(WebCore::HitTestResult::toggleMediaFullscreenState):
Call the renamed HTMLMediaElement::toggleStandardFullscreenState().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementh">trunk/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#trunkSourceWebCorerenderingHitTestResultcpp">trunk/Source/WebCore/rendering/HitTestResult.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199732 => 199733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-19 17:46:48 UTC (rev 199732)
+++ trunk/Source/WebCore/ChangeLog 2016-04-19 17:58:57 UTC (rev 199733)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-04-18 Ada Chan <adachan@apple.com>
+
+ Context menu items related to fullscreen should be specific to standard fullscreen
+ https://bugs.webkit.org/show_bug.cgi?id=156723
+ <rdar://problem/25452632>
+
+ Reviewed by Darin Adler.
+
+ Introduce HTMLMediaElement::isStandardFullscreen() that the HitTestResult code can use
+ when handling the validation and selection of fullscreen-related context menu items.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::isStandardFullscreen):
+ (WebCore::HTMLMediaElement::toggleStandardFullscreenState):
+ Renamed to make it clear that it's for toggling standard fullscreen. Call the new
+ HTMLMediaElement::isStandardFullscreen().
+ * html/HTMLMediaElement.h:
+ * rendering/HitTestResult.cpp:
+ (WebCore::HitTestResult::mediaIsInFullscreen):
+ Use HTMLMediaElement::isStandardFullscreen().
+ (WebCore::HitTestResult::toggleMediaFullscreenState):
+ Call the renamed HTMLMediaElement::toggleStandardFullscreenState().
+
</ins><span class="cx"> 2016-04-19 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: ObjectStore Blob Support.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (199732 => 199733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-04-19 17:46:48 UTC (rev 199732)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-04-19 17:58:57 UTC (rev 199733)
</span><span class="lines">@@ -5312,11 +5312,21 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLMediaElement::toggleFullscreenState()
</del><ins>+bool HTMLMediaElement::isStandardFullscreen() const
</ins><span class="cx"> {
</span><del>- LOG(Media, "HTMLMediaElement::toggleFullscreenState(%p) - isFullscreen() is %s", this, boolString(isFullscreen()));
</del><ins>+#if ENABLE(FULLSCREEN_API)
+ if (document().webkitIsFullScreen() && document().webkitCurrentFullScreenElement() == this)
+ return true;
+#endif
+
+ return m_videoFullscreenMode == VideoFullscreenModeStandard;
+}
+
+void HTMLMediaElement::toggleStandardFullscreenState()
+{
+ LOG(Media, "HTMLMediaElement::toggleStandardFullscreenState(%p) - isStandardFullscreen() is %s", this, boolString(isStandardFullscreen()));
</ins><span class="cx">
</span><del>- if (isFullscreen())
</del><ins>+ if (isStandardFullscreen())
</ins><span class="cx"> exitFullscreen();
</span><span class="cx"> else
</span><span class="cx"> enterFullscreen();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (199732 => 199733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2016-04-19 17:46:48 UTC (rev 199732)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2016-04-19 17:58:57 UTC (rev 199733)
</span><span class="lines">@@ -358,7 +358,8 @@
</span><span class="cx"> bool hasSingleSecurityOrigin() const { return !m_player || m_player->hasSingleSecurityOrigin(); }
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT bool isFullscreen() const override;
</span><del>- void toggleFullscreenState();
</del><ins>+ bool isStandardFullscreen() const;
+ void toggleStandardFullscreenState();
</ins><span class="cx">
</span><span class="cx"> using MediaPlayerEnums::VideoFullscreenMode;
</span><span class="cx"> VideoFullscreenMode fullscreenMode() const { return m_videoFullscreenMode; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingHitTestResultcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/HitTestResult.cpp (199732 => 199733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/HitTestResult.cpp 2016-04-19 17:46:48 UTC (rev 199732)
+++ trunk/Source/WebCore/rendering/HitTestResult.cpp 2016-04-19 17:58:57 UTC (rev 199733)
</span><span class="lines">@@ -447,7 +447,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx"> if (HTMLMediaElement* mediaElement = this->mediaElement())
</span><del>- return mediaElement->isVideo() && mediaElement->isFullscreen();
</del><ins>+ return mediaElement->isVideo() && mediaElement->isStandardFullscreen();
</ins><span class="cx"> #endif
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -458,7 +458,7 @@
</span><span class="cx"> if (HTMLMediaElement* mediaElement = this->mediaElement()) {
</span><span class="cx"> if (mediaElement->isVideo() && mediaElement->supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenModeStandard)) {
</span><span class="cx"> UserGestureIndicator indicator(DefinitelyProcessingUserGesture, &mediaElement->document());
</span><del>- mediaElement->toggleFullscreenState();
</del><ins>+ mediaElement->toggleStandardFullscreenState();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>