<!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>[160910] 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/160910">160910</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2013-12-20 07:36:56 -0800 (Fri, 20 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed GTK build fix after <a href="http://trac.webkit.org/projects/webkit/changeset/160909">r160909</a>.
Remove remaining uses of AttachLazily in code specific to the GTK port.
* html/shadow/MediaControlsGtk.cpp:
(WebCore::MediaControlsGtk::initializeControls):
(WebCore::MediaControlsGtk::createTextTrackDisplay):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlsGtkcpp">trunk/Source/WebCore/html/shadow/MediaControlsGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160909 => 160910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-20 14:58:40 UTC (rev 160909)
+++ trunk/Source/WebCore/ChangeLog 2013-12-20 15:36:56 UTC (rev 160910)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2013-12-20 Zan Dobersek <zdobersek@igalia.com>
+
+ Unreviewed GTK build fix after r160909.
+ Remove remaining uses of AttachLazily in code specific to the GTK port.
+
+ * html/shadow/MediaControlsGtk.cpp:
+ (WebCore::MediaControlsGtk::initializeControls):
+ (WebCore::MediaControlsGtk::createTextTrackDisplay):
+
</ins><span class="cx"> 2013-12-19 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Create render tree lazily
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlsGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControlsGtk.cpp (160909 => 160910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControlsGtk.cpp 2013-12-20 14:58:40 UTC (rev 160909)
+++ trunk/Source/WebCore/html/shadow/MediaControlsGtk.cpp 2013-12-20 15:36:56 UTC (rev 160910)
</span><span class="lines">@@ -94,26 +94,26 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<MediaControlPlayButtonElement> playButton = MediaControlPlayButtonElement::create(document);
</span><span class="cx"> m_playButton = playButton.get();
</span><del>- panel->appendChild(playButton.release(), exceptionCode, AttachLazily);
</del><ins>+ panel->appendChild(playButton.release(), exceptionCode);
</ins><span class="cx"> if (exceptionCode)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> RefPtr<MediaControlTimelineElement> timeline = MediaControlTimelineElement::create(document, this);
</span><span class="cx"> m_timeline = timeline.get();
</span><del>- panel->appendChild(timeline.release(), exceptionCode, AttachLazily);
</del><ins>+ panel->appendChild(timeline.release(), exceptionCode);
</ins><span class="cx"> if (exceptionCode)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> RefPtr<MediaControlCurrentTimeDisplayElement> currentTimeDisplay = MediaControlCurrentTimeDisplayElement::create(document);
</span><span class="cx"> m_currentTimeDisplay = currentTimeDisplay.get();
</span><span class="cx"> m_currentTimeDisplay->hide();
</span><del>- panel->appendChild(currentTimeDisplay.release(), exceptionCode, AttachLazily);
</del><ins>+ panel->appendChild(currentTimeDisplay.release(), exceptionCode);
</ins><span class="cx"> if (exceptionCode)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> RefPtr<MediaControlTimeRemainingDisplayElement> durationDisplay = MediaControlTimeRemainingDisplayElement::create(document);
</span><span class="cx"> m_durationDisplay = durationDisplay.get();
</span><del>- panel->appendChild(durationDisplay.release(), exceptionCode, AttachLazily);
</del><ins>+ panel->appendChild(durationDisplay.release(), exceptionCode);
</ins><span class="cx"> if (exceptionCode)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -122,54 +122,54 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<MediaControlClosedCaptionsTrackListElement> closedCaptionsTrackList = MediaControlClosedCaptionsTrackListElement::create(document, this);
</span><span class="cx"> m_closedCaptionsTrackList = closedCaptionsTrackList.get();
</span><del>- closedCaptionsContainer->appendChild(closedCaptionsTrackList.release(), exceptionCode, AttachLazily);
</del><ins>+ closedCaptionsContainer->appendChild(closedCaptionsTrackList.release(), exceptionCode);
</ins><span class="cx"> if (exceptionCode)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> RefPtr<MediaControlToggleClosedCaptionsButtonElement> toggleClosedCaptionsButton = MediaControlToggleClosedCaptionsButtonElement::create(document, this);
</span><span class="cx"> m_toggleClosedCaptionsButton = toggleClosedCaptionsButton.get();
</span><del>- panel->appendChild(toggleClosedCaptionsButton.release(), exceptionCode, AttachLazily);
</del><ins>+ panel->appendChild(toggleClosedCaptionsButton.release(), exceptionCode);
</ins><span class="cx"> if (exceptionCode)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> m_closedCaptionsContainer = closedCaptionsContainer.get();
</span><del>- appendChild(closedCaptionsContainer.release(), exceptionCode, AttachLazily);
</del><ins>+ appendChild(closedCaptionsContainer.release(), exceptionCode);
</ins><span class="cx"> if (exceptionCode)
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<MediaControlFullscreenButtonElement> fullscreenButton = MediaControlFullscreenButtonElement::create(document);
</span><span class="cx"> m_fullScreenButton = fullscreenButton.get();
</span><del>- panel->appendChild(fullscreenButton.release(), exceptionCode, AttachLazily);
</del><ins>+ panel->appendChild(fullscreenButton.release(), exceptionCode);
</ins><span class="cx"> if (exceptionCode)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> RefPtr<MediaControlPanelMuteButtonElement> panelMuteButton = MediaControlPanelMuteButtonElement::create(document, this);
</span><span class="cx"> m_panelMuteButton = panelMuteButton.get();
</span><del>- panel->appendChild(panelMuteButton.release(), exceptionCode, AttachLazily);
</del><ins>+ panel->appendChild(panelMuteButton.release(), exceptionCode);
</ins><span class="cx"> if (exceptionCode)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> RefPtr<MediaControlVolumeSliderContainerElement> sliderContainer = MediaControlVolumeSliderContainerElement::create(document);
</span><span class="cx"> m_volumeSliderContainer = sliderContainer.get();
</span><del>- panel->appendChild(sliderContainer.release(), exceptionCode, AttachLazily);
</del><ins>+ panel->appendChild(sliderContainer.release(), exceptionCode);
</ins><span class="cx"> if (exceptionCode)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> RefPtr<MediaControlPanelVolumeSliderElement> slider = MediaControlPanelVolumeSliderElement::create(document);
</span><span class="cx"> m_volumeSlider = slider.get();
</span><span class="cx"> m_volumeSlider->setClearMutedOnUserInteraction(true);
</span><del>- m_volumeSliderContainer->appendChild(slider.release(), exceptionCode, AttachLazily);
</del><ins>+ m_volumeSliderContainer->appendChild(slider.release(), exceptionCode);
</ins><span class="cx"> if (exceptionCode)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> m_panel = panel.get();
</span><del>- enclosure->appendChild(panel.release(), exceptionCode, AttachLazily);
</del><ins>+ enclosure->appendChild(panel.release(), exceptionCode);
</ins><span class="cx"> if (exceptionCode)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> m_enclosure = enclosure.get();
</span><del>- appendChild(enclosure.release(), exceptionCode, AttachLazily);
</del><ins>+ appendChild(enclosure.release(), exceptionCode);
</ins><span class="cx"> if (exceptionCode)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -285,7 +285,7 @@
</span><span class="cx"> m_textDisplayContainer->setMediaController(m_mediaController);
</span><span class="cx">
</span><span class="cx"> // Insert it before the first controller element so it always displays behind the controls.
</span><del>- insertBefore(textDisplayContainer.release(), m_enclosure, ASSERT_NO_EXCEPTION, AttachLazily);
</del><ins>+ insertBefore(textDisplayContainer.release(), m_enclosure, ASSERT_NO_EXCEPTION);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>