<!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>[161746] 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/161746">161746</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-10 22:41:35 -0800 (Fri, 10 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix HTMLMediaElement.o for iOS. Unreviewed build fix.
There is now local variable mediaElement. Just call the
functions since they are methods on this class.
Fix RequireUserGestureToShowPlaybackTargetPickerRestriction typos.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::parseAttribute):</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161745 => 161746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-11 06:33:45 UTC (rev 161745)
+++ trunk/Source/WebCore/ChangeLog 2014-01-11 06:41:35 UTC (rev 161746)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-01-10 Joseph Pecoraro <pecoraro@apple.com>
+
+ Fix HTMLMediaElement.o for iOS. Unreviewed build fix.
+
+ There is now local variable mediaElement. Just call the
+ functions since they are methods on this class.
+
+ Fix RequireUserGestureToShowPlaybackTargetPickerRestriction typos.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::parseAttribute):
+
</ins><span class="cx"> 2014-01-10 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Move progress tracking functions from FrameLoaderClient to a new ProgressTrackerClient
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (161745 => 161746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-01-11 06:33:45 UTC (rev 161745)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-01-11 06:41:35 UTC (rev 161746)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
</span><span class="cx"> * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
</span><span class="cx"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><del>- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</del><ins>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</ins><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="lines">@@ -365,7 +365,7 @@
</span><span class="cx"> if (!settings || settings->mediaPlaybackRequiresUserGesture()) {
</span><span class="cx"> addBehaviorRestriction(RequireUserGestureForRateChangeRestriction);
</span><span class="cx"> #if ENABLE(IOS_AIRPLAY)
</span><del>- addBehaviorRestriction(RequireUserGestureToShowPlaybackTargetPicker);
</del><ins>+ addBehaviorRestriction(RequireUserGestureToShowPlaybackTargetPickerRestriction);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="lines">@@ -4721,17 +4721,17 @@
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::updateWidget(PluginCreationOption)
</span><span class="cx"> {
</span><del>- mediaElement->setNeedWidgetUpdate(false);
</del><ins>+ setNeedWidgetUpdate(false);
</ins><span class="cx">
</span><ins>+ // FIXME: What if document().frame() is 0?
+
+ URL url;
</ins><span class="cx"> Vector<String> paramNames;
</span><span class="cx"> Vector<String> paramValues;
</span><del>- // FIXME: Rename kurl to something more sensible.
- URL kurl;
</del><span class="cx">
</span><del>- mediaElement->getPluginProxyParams(kurl, paramNames, paramValues);
- // FIXME: What if document().frame() is 0?
</del><ins>+ getPluginProxyParams(url, paramNames, paramValues);
</ins><span class="cx"> SubframeLoader& loader = document().frame()->loader().subframeLoader();
</span><del>- loader.loadMediaPlayerProxyPlugin(*mediaElement, kurl, paramNames, paramValues);
</del><ins>+ loader.loadMediaPlayerProxyPlugin(*this, url, paramNames, paramValues);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(PLUGIN_PROXY_FOR_VIDEO)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (161745 => 161746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2014-01-11 06:33:45 UTC (rev 161745)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2014-01-11 06:41:35 UTC (rev 161746)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
</span><span class="cx"> * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
</span><span class="cx"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><del>- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</del><ins>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</ins><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #ifndef HTMLMediaElement_h
</span><span class="lines">@@ -451,7 +451,7 @@
</span><span class="cx"> RequirePageConsentToLoadMediaRestriction = 1 << 3,
</span><span class="cx"> RequirePageConsentToResumeMediaRestriction = 1 << 4,
</span><span class="cx"> #if ENABLE(IOS_AIRPLAY)
</span><del>- RequireUserGestureToShowPlaybackTargetPicker = 1 << 5,
</del><ins>+ RequireUserGestureToShowPlaybackTargetPickerRestriction = 1 << 5,
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx"> typedef unsigned BehaviorRestrictions;
</span><span class="lines">@@ -462,7 +462,7 @@
</span><span class="cx"> bool pageConsentRequiredForLoad() const { return m_restrictions & RequirePageConsentToLoadMediaRestriction; }
</span><span class="cx"> bool pageConsentRequiredForResume() const { return m_restrictions & RequirePageConsentToResumeMediaRestriction; }
</span><span class="cx"> #if ENABLE(IOS_AIRPLAY)
</span><del>- bool userGestureRequiredToShowPlaybackTargetPicker() const { return m_restrictions & RequireUserGestureToShowPlaybackTargetPicker; }
</del><ins>+ bool userGestureRequiredToShowPlaybackTargetPicker() const { return m_restrictions & RequireUserGestureToShowPlaybackTargetPickerRestriction; }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void addBehaviorRestriction(BehaviorRestrictions restriction) { m_restrictions |= restriction; }
</span></span></pre>
</div>
</div>
</body>
</html>