<!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>[177179] 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/177179">177179</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2014-12-11 13:57:57 -0800 (Thu, 11 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Crash in -[WebVideoFullscreenHUDWindowController playing] in WK1 clients without FULLSCREEN_API enabled.
https://bugs.webkit.org/show_bug.cgi?id=139546
Reviewed by Eric Carlson.
Finish the work started by <a href="http://trac.webkit.org/projects/webkit/changeset/173230">r173230</a> and rename mediaElement -> videoElement in WebVideoFullscreenHUDWindowController.
* platform/mac/WebVideoFullscreenHUDWindowController.h:
* platform/mac/WebVideoFullscreenHUDWindowController.mm:
(-[WebVideoFullscreenHUDWindowController endScrubbing]):
(-[WebVideoFullscreenHUDWindowController timelinePositionChanged:]):
(-[WebVideoFullscreenHUDWindowController currentTime]):
(-[WebVideoFullscreenHUDWindowController setCurrentTime:]):
(-[WebVideoFullscreenHUDWindowController duration]):
(-[WebVideoFullscreenHUDWindowController decrementVolume]):
(-[WebVideoFullscreenHUDWindowController incrementVolume]):
(-[WebVideoFullscreenHUDWindowController volume]):
(-[WebVideoFullscreenHUDWindowController setVolume:]):
(-[WebVideoFullscreenHUDWindowController playing]):
(-[WebVideoFullscreenHUDWindowController setPlaying:]):
(-[WebVideoFullscreenHUDWindowController remainingTimeText]):
(-[WebVideoFullscreenHUDWindowController elapsedTimeText]):
(-[WebVideoFullscreenHUDWindowController rewind:]):
(-[WebVideoFullscreenHUDWindowController fastForward:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebVideoFullscreenHUDWindowControllerh">trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebVideoFullscreenHUDWindowControllermm">trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177178 => 177179)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-11 21:42:22 UTC (rev 177178)
+++ trunk/Source/WebCore/ChangeLog 2014-12-11 21:57:57 UTC (rev 177179)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-12-11 Jer Noble <jer.noble@apple.com>
+
+ [Mac] Crash in -[WebVideoFullscreenHUDWindowController playing] in WK1 clients without FULLSCREEN_API enabled.
+ https://bugs.webkit.org/show_bug.cgi?id=139546
+
+ Reviewed by Eric Carlson.
+
+ Finish the work started by r173230 and rename mediaElement -> videoElement in WebVideoFullscreenHUDWindowController.
+
+ * platform/mac/WebVideoFullscreenHUDWindowController.h:
+ * platform/mac/WebVideoFullscreenHUDWindowController.mm:
+ (-[WebVideoFullscreenHUDWindowController endScrubbing]):
+ (-[WebVideoFullscreenHUDWindowController timelinePositionChanged:]):
+ (-[WebVideoFullscreenHUDWindowController currentTime]):
+ (-[WebVideoFullscreenHUDWindowController setCurrentTime:]):
+ (-[WebVideoFullscreenHUDWindowController duration]):
+ (-[WebVideoFullscreenHUDWindowController decrementVolume]):
+ (-[WebVideoFullscreenHUDWindowController incrementVolume]):
+ (-[WebVideoFullscreenHUDWindowController volume]):
+ (-[WebVideoFullscreenHUDWindowController setVolume:]):
+ (-[WebVideoFullscreenHUDWindowController playing]):
+ (-[WebVideoFullscreenHUDWindowController setPlaying:]):
+ (-[WebVideoFullscreenHUDWindowController remainingTimeText]):
+ (-[WebVideoFullscreenHUDWindowController elapsedTimeText]):
+ (-[WebVideoFullscreenHUDWindowController rewind:]):
+ (-[WebVideoFullscreenHUDWindowController fastForward:]):
+
</ins><span class="cx"> 2014-12-11 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix iOS build.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebVideoFullscreenHUDWindowControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.h (177178 => 177179)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.h 2014-12-11 21:42:22 UTC (rev 177178)
+++ trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.h 2014-12-11 21:57:57 UTC (rev 177179)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> #import <AppKit/NSWindowController.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><del>- class HTMLMediaElement;
</del><ins>+class HTMLVideoElement;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @protocol WebVideoFullscreenHUDWindowControllerDelegate;
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx">
</span><span class="cx"> @protocol WebVideoFullscreenHUDWindowControllerDelegate <NSObject>
</span><span class="cx"> - (void)requestExitFullscreen;
</span><del>-- (WebCore::HTMLMediaElement*)mediaElement;
</del><ins>+- (WebCore::HTMLVideoElement*)videoElement;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebVideoFullscreenHUDWindowControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm (177178 => 177179)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm 2014-12-11 21:42:22 UTC (rev 177178)
+++ trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm 2014-12-11 21:57:57 UTC (rev 177179)
</span><span class="lines">@@ -30,8 +30,8 @@
</span><span class="cx">
</span><span class="cx"> #import "ExceptionCodePlaceholder.h"
</span><span class="cx"> #import "FloatConversion.h"
</span><ins>+#import <WebCore/HTMLVideoElement.h>
</ins><span class="cx"> #import <WebCoreSystemInterface.h>
</span><del>-#import <WebCore/HTMLMediaElement.h>
</del><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -406,8 +406,8 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(_isScrubbing);
</span><span class="cx"> _isScrubbing = NO;
</span><del>- if (HTMLMediaElement* mediaElement = [_delegate mediaElement])
- mediaElement->endScrubbing();
</del><ins>+ if (HTMLVideoElement* videoElement = [_delegate videoElement])
+ videoElement->endScrubbing();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)timelinePositionChanged:(id)sender
</span><span class="lines">@@ -416,8 +416,8 @@
</span><span class="cx"> [self setCurrentTime:[_timeline floatValue]];
</span><span class="cx"> if (!_isScrubbing) {
</span><span class="cx"> _isScrubbing = YES;
</span><del>- if (HTMLMediaElement* mediaElement = [_delegate mediaElement])
- mediaElement->beginScrubbing();
</del><ins>+ if (HTMLVideoElement* videoElement = [_delegate videoElement])
+ videoElement->beginScrubbing();
</ins><span class="cx"> static NSArray *endScrubbingModes = [[NSArray alloc] initWithObjects:NSDefaultRunLoopMode, NSModalPanelRunLoopMode, nil];
</span><span class="cx"> // Schedule -endScrubbing for when leaving mouse tracking mode.
</span><span class="cx"> [[NSRunLoop currentRunLoop] performSelector:@selector(endScrubbing) target:self argument:nil order:0 modes:endScrubbingModes];
</span><span class="lines">@@ -426,20 +426,20 @@
</span><span class="cx">
</span><span class="cx"> - (float)currentTime
</span><span class="cx"> {
</span><del>- return [_delegate mediaElement] ? [_delegate mediaElement]->currentTime() : 0;
</del><ins>+ return [_delegate videoElement] ? [_delegate videoElement]->currentTime() : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setCurrentTime:(float)currentTime
</span><span class="cx"> {
</span><del>- if (![_delegate mediaElement])
</del><ins>+ if (![_delegate videoElement])
</ins><span class="cx"> return;
</span><del>- [_delegate mediaElement]->setCurrentTime(currentTime);
</del><ins>+ [_delegate videoElement]->setCurrentTime(currentTime);
</ins><span class="cx"> [self updateTime];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (double)duration
</span><span class="cx"> {
</span><del>- return [_delegate mediaElement] ? [_delegate mediaElement]->duration() : 0;
</del><ins>+ return [_delegate videoElement] ? [_delegate videoElement]->duration() : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (float)maxVolume
</span><span class="lines">@@ -468,7 +468,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)decrementVolume
</span><span class="cx"> {
</span><del>- if (![_delegate mediaElement])
</del><ins>+ if (![_delegate videoElement])
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> float volume = [self volume] - 10;
</span><span class="lines">@@ -477,7 +477,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)incrementVolume
</span><span class="cx"> {
</span><del>- if (![_delegate mediaElement])
</del><ins>+ if (![_delegate videoElement])
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> float volume = [self volume] + 10;
</span><span class="lines">@@ -486,16 +486,16 @@
</span><span class="cx">
</span><span class="cx"> - (float)volume
</span><span class="cx"> {
</span><del>- return [_delegate mediaElement] ? [_delegate mediaElement]->volume() * [self maxVolume] : 0;
</del><ins>+ return [_delegate videoElement] ? [_delegate videoElement]->volume() * [self maxVolume] : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setVolume:(float)volume
</span><span class="cx"> {
</span><del>- if (![_delegate mediaElement])
</del><ins>+ if (![_delegate videoElement])
</ins><span class="cx"> return;
</span><del>- if ([_delegate mediaElement]->muted())
- [_delegate mediaElement]->setMuted(false);
- [_delegate mediaElement]->setVolume(volume / [self maxVolume], IGNORE_EXCEPTION);
</del><ins>+ if ([_delegate videoElement]->muted())
+ [_delegate videoElement]->setMuted(false);
+ [_delegate videoElement]->setVolume(volume / [self maxVolume], IGNORE_EXCEPTION);
</ins><span class="cx"> [self updateVolume];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -526,24 +526,24 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)playing
</span><span class="cx"> {
</span><del>- HTMLMediaElement* mediaElement = [_delegate mediaElement];
- if (!mediaElement)
</del><ins>+ HTMLVideoElement* videoElement = [_delegate videoElement];
+ if (!videoElement)
</ins><span class="cx"> return NO;
</span><span class="cx">
</span><del>- return !mediaElement->canPlay();
</del><ins>+ return !videoElement->canPlay();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setPlaying:(BOOL)playing
</span><span class="cx"> {
</span><del>- HTMLMediaElement* mediaElement = [_delegate mediaElement];
</del><ins>+ HTMLVideoElement* videoElement = [_delegate videoElement];
</ins><span class="cx">
</span><del>- if (!mediaElement)
</del><ins>+ if (!videoElement)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (playing)
</span><del>- mediaElement->play();
</del><ins>+ videoElement->play();
</ins><span class="cx"> else
</span><del>- mediaElement->pause();
</del><ins>+ videoElement->pause();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static NSString *timeToString(double time)
</span><span class="lines">@@ -566,19 +566,19 @@
</span><span class="cx">
</span><span class="cx"> - (NSString *)remainingTimeText
</span><span class="cx"> {
</span><del>- HTMLMediaElement* mediaElement = [_delegate mediaElement];
- if (!mediaElement)
</del><ins>+ HTMLVideoElement* videoElement = [_delegate videoElement];
+ if (!videoElement)
</ins><span class="cx"> return @"";
</span><span class="cx">
</span><del>- return [@"-" stringByAppendingString:timeToString(mediaElement->duration() - mediaElement->currentTime())];
</del><ins>+ return [@"-" stringByAppendingString:timeToString(videoElement->duration() - videoElement->currentTime())];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSString *)elapsedTimeText
</span><span class="cx"> {
</span><del>- if (![_delegate mediaElement])
</del><ins>+ if (![_delegate videoElement])
</ins><span class="cx"> return @"";
</span><span class="cx">
</span><del>- return timeToString([_delegate mediaElement]->currentTime());
</del><ins>+ return timeToString([_delegate videoElement]->currentTime());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // MARK: NSResponder
</span><span class="lines">@@ -601,15 +601,15 @@
</span><span class="cx"> - (void)rewind:(id)sender
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(sender);
</span><del>- if (![_delegate mediaElement])
</del><ins>+ if (![_delegate videoElement])
</ins><span class="cx"> return;
</span><del>- [_delegate mediaElement]->rewind(30);
</del><ins>+ [_delegate videoElement]->rewind(30);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)fastForward:(id)sender
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(sender);
</span><del>- if (![_delegate mediaElement])
</del><ins>+ if (![_delegate videoElement])
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>