<!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>[192144] trunk/Source/WebKit/win</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/192144">192144</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-11-08 09:11:23 -0800 (Sun, 08 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix the Windows build after <a href="http://trac.webkit.org/projects/webkit/changeset/192140">r192140</a>.
* FullscreenVideoController.cpp:
(HUDButton::draw):
(HUDSlider::draw):
(FullscreenVideoController::draw):
* Plugins/PluginView.cpp:
(WebCore::PluginView::paintMissingPluginIcon):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinFullscreenVideoControllercpp">trunk/Source/WebKit/win/FullscreenVideoController.cpp</a></li>
<li><a href="#trunkSourceWebKitwinPluginsPluginViewcpp">trunk/Source/WebKit/win/Plugins/PluginView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (192143 => 192144)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-11-08 15:32:41 UTC (rev 192143)
+++ trunk/Source/WebKit/win/ChangeLog 2015-11-08 17:11:23 UTC (rev 192144)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-11-08 Simon Fraser <simon.fraser@apple.com>
+
+ Fix the Windows build after r192140.
+
+ * FullscreenVideoController.cpp:
+ (HUDButton::draw):
+ (HUDSlider::draw):
+ (FullscreenVideoController::draw):
+ * Plugins/PluginView.cpp:
+ (WebCore::PluginView::paintMissingPluginIcon):
+
</ins><span class="cx"> 2015-11-02 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> Rename JSDOMWrapper.impl to JSDOMWrapper.wrapped
</span></span></pre></div>
<a id="trunkSourceWebKitwinFullscreenVideoControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/FullscreenVideoController.cpp (192143 => 192144)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/FullscreenVideoController.cpp 2015-11-08 15:32:41 UTC (rev 192143)
+++ trunk/Source/WebKit/win/FullscreenVideoController.cpp 2015-11-08 17:11:23 UTC (rev 192144)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> void HUDButton::draw(GraphicsContext& context)
</span><span class="cx"> {
</span><span class="cx"> Image* image = (m_showAltButton && m_buttonImageAlt) ? m_buttonImageAlt.get() : m_buttonImage.get();
</span><del>- context.drawImage(*image, ColorSpaceDeviceRGB, m_rect.location());
</del><ins>+ context.drawImage(*image, m_rect.location());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HUDSlider::HUDSlider(HUDSliderButtonShape shape, int buttonSize, const IntRect& rect)
</span><span class="lines">@@ -134,11 +134,11 @@
</span><span class="cx"> {
</span><span class="cx"> // Draw gutter
</span><span class="cx"> IntSize radius(m_rect.height() / 2, m_rect.height() / 2);
</span><del>- context.fillRoundedRect(FloatRoundedRect(m_rect, radius, radius, radius, radius), Color(sliderGutterColor), ColorSpaceDeviceRGB);
</del><ins>+ context.fillRoundedRect(FloatRoundedRect(m_rect, radius, radius, radius, radius), Color(sliderGutterColor));
</ins><span class="cx">
</span><span class="cx"> // Draw button
</span><del>- context.setStrokeColor(Color(sliderButtonColor), ColorSpaceDeviceRGB);
- context.setFillColor(Color(sliderButtonColor), ColorSpaceDeviceRGB);
</del><ins>+ context.setStrokeColor(Color(sliderButtonColor));
+ context.setFillColor(Color(sliderButtonColor));
</ins><span class="cx">
</span><span class="cx"> if (m_buttonShape == RoundButton) {
</span><span class="cx"> context.drawEllipse(IntRect(m_rect.location().x() + m_buttonPosition, m_rect.location().y() - (m_buttonSize - m_rect.height()) / 2, m_buttonSize, m_buttonSize));
</span><span class="lines">@@ -490,9 +490,9 @@
</span><span class="cx"> IntSize innerRadius(borderRadius - borderThickness, borderRadius - borderThickness);
</span><span class="cx"> IntRect innerRect(borderThickness, borderThickness, windowWidth - borderThickness * 2, windowHeight - borderThickness * 2);
</span><span class="cx">
</span><del>- context.fillRoundedRect(FloatRoundedRect(outerRect, outerRadius, outerRadius, outerRadius, outerRadius), Color(borderColor), ColorSpaceDeviceRGB);
</del><ins>+ context.fillRoundedRect(FloatRoundedRect(outerRect, outerRadius, outerRadius, outerRadius, outerRadius), Color(borderColor));
</ins><span class="cx"> context.setCompositeOperation(CompositeCopy);
</span><del>- context.fillRoundedRect(FloatRoundedRect(innerRect, innerRadius, innerRadius, innerRadius, innerRadius), Color(backgroundColor), ColorSpaceDeviceRGB);
</del><ins>+ context.fillRoundedRect(FloatRoundedRect(innerRect, innerRadius, innerRadius, innerRadius, innerRadius), Color(backgroundColor));
</ins><span class="cx">
</span><span class="cx"> // Draw the widgets
</span><span class="cx"> m_playPauseButton.draw(context);
</span><span class="lines">@@ -526,13 +526,13 @@
</span><span class="cx"> s = timeToString(currentTime());
</span><span class="cx"> int fontHeight = font.fontMetrics().height();
</span><span class="cx"> TextRun leftText(s);
</span><del>- context.setFillColor(Color(textColor), ColorSpaceDeviceRGB);
</del><ins>+ context.setFillColor(Color(textColor));
</ins><span class="cx"> context.drawText(font, leftText, IntPoint(windowWidth / 2 - timeSliderWidth / 2 - margin - font.width(leftText), windowHeight - margin - sliderHeight / 2 + fontHeight / 4));
</span><span class="cx">
</span><span class="cx"> // Right string
</span><span class="cx"> s = timeToString(currentTime() - duration());
</span><span class="cx"> TextRun rightText(s);
</span><del>- context.setFillColor(Color(textColor), ColorSpaceDeviceRGB);
</del><ins>+ context.setFillColor(Color(textColor));
</ins><span class="cx"> context.drawText(font, rightText, IntPoint(windowWidth / 2 + timeSliderWidth / 2 + margin, windowHeight - margin - sliderHeight / 2 + fontHeight / 4));
</span><span class="cx">
</span><span class="cx"> // Copy to the window
</span></span></pre></div>
<a id="trunkSourceWebKitwinPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/Plugins/PluginView.cpp (192143 => 192144)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Plugins/PluginView.cpp 2015-11-08 15:32:41 UTC (rev 192143)
+++ trunk/Source/WebKit/win/Plugins/PluginView.cpp 2015-11-08 17:11:23 UTC (rev 192144)
</span><span class="lines">@@ -1122,7 +1122,7 @@
</span><span class="cx">
</span><span class="cx"> context.save();
</span><span class="cx"> context.clip(windowClipRect());
</span><del>- context.drawImage(*nullPluginImage, ColorSpaceDeviceRGB, imageRect.location());
</del><ins>+ context.drawImage(*nullPluginImage, imageRect.location());
</ins><span class="cx"> context.restore();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>