<!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>[178520] 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/178520">178520</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-01-15 11:41:40 -0800 (Thu, 15 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Try to fix windows build.
* platform/graphics/ca/win/PlatformCALayerWin.cpp:
* platform/graphics/ca/win/PlatformCALayerWinInternal.cpp:
(PlatformCALayerWinInternal::displayCallback):
* platform/win/DragImageWin.cpp:
(WebCore::dragLabelFont):
(WebCore::createDragImageForLink):
* platform/win/PopupMenuWin.cpp:
(WebCore::PopupMenuWin::calculatePositionAndSize):
(WebCore::PopupMenuWin::paint):
* platform/win/WebCoreTextRenderer.cpp:
(WebCore::doDrawTextAtPoint):
(WebCore::WebCoreDrawDoubledTextAtPoint):
(WebCore::WebCoreTextFloatWidth):
(WebCore::WebCoreSetAlwaysUsesComplexTextCodePath):
(WebCore::WebCoreAlwaysUsesComplexTextCodePath):
* rendering/RenderThemeSafari.cpp:
(WebCore::RenderThemeSafari::setFontFromControlSize):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscawinPlatformCALayerWincpp">trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscawinPlatformCALayerWinInternalcpp">trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformwinDragImageWincpp">trunk/Source/WebCore/platform/win/DragImageWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformwinPopupMenuWincpp">trunk/Source/WebCore/platform/win/PopupMenuWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformwinWebCoreTextRenderercpp">trunk/Source/WebCore/platform/win/WebCoreTextRenderer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeSafaricpp">trunk/Source/WebCore/rendering/RenderThemeSafari.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178519 => 178520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-15 19:34:51 UTC (rev 178519)
+++ trunk/Source/WebCore/ChangeLog 2015-01-15 19:41:40 UTC (rev 178520)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2015-01-15 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><ins>+ Try to fix windows build.
+
+ * platform/graphics/ca/win/PlatformCALayerWin.cpp:
+ * platform/graphics/ca/win/PlatformCALayerWinInternal.cpp:
+ (PlatformCALayerWinInternal::displayCallback):
+ * platform/win/DragImageWin.cpp:
+ (WebCore::dragLabelFont):
+ (WebCore::createDragImageForLink):
+ * platform/win/PopupMenuWin.cpp:
+ (WebCore::PopupMenuWin::calculatePositionAndSize):
+ (WebCore::PopupMenuWin::paint):
+ * platform/win/WebCoreTextRenderer.cpp:
+ (WebCore::doDrawTextAtPoint):
+ (WebCore::WebCoreDrawDoubledTextAtPoint):
+ (WebCore::WebCoreTextFloatWidth):
+ (WebCore::WebCoreSetAlwaysUsesComplexTextCodePath):
+ (WebCore::WebCoreAlwaysUsesComplexTextCodePath):
+ * rendering/RenderThemeSafari.cpp:
+ (WebCore::RenderThemeSafari::setFontFromControlSize):
+
+2015-01-15 Antti Koivisto <antti@apple.com>
+
</ins><span class="cx"> Unreviewed, rolling out r178518.
</span><span class="cx">
</span><span class="cx"> Didn't mean to commit some of this
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscawinPlatformCALayerWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp (178519 => 178520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp 2015-01-15 19:34:51 UTC (rev 178519)
+++ trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp 2015-01-15 19:41:40 UTC (rev 178520)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> #include "PlatformCALayerWin.h"
</span><span class="cx">
</span><span class="cx"> #include "AbstractCACFLayerTreeHost.h"
</span><del>-#include "Font.h"
</del><ins>+#include "FontCascade.h"
</ins><span class="cx"> #include "GraphicsContext.h"
</span><span class="cx"> #include "PlatformCAAnimationWin.h"
</span><span class="cx"> #include "PlatformCALayerWinInternal.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscawinPlatformCALayerWinInternalcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp (178519 => 178520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp 2015-01-15 19:34:51 UTC (rev 178519)
+++ trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp 2015-01-15 19:41:40 UTC (rev 178520)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx">
</span><span class="cx"> #include "PlatformCALayerWinInternal.h"
</span><span class="cx">
</span><del>-#include "Font.h"
</del><ins>+#include "FontCascade.h"
</ins><span class="cx"> #include "GraphicsContext.h"
</span><span class="cx"> #include "PlatformCALayer.h"
</span><span class="cx"> #include "TextRun.h"
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx">
</span><span class="cx"> desc.setComputedSize(18);
</span><span class="cx">
</span><del>- Font font = Font(desc, 0, 0);
</del><ins>+ FontCascade font = FontCascade(desc, 0, 0);
</ins><span class="cx"> font.update(0);
</span><span class="cx">
</span><span class="cx"> GraphicsContext cg(context);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinDragImageWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/DragImageWin.cpp (178519 => 178520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/DragImageWin.cpp 2015-01-15 19:34:51 UTC (rev 178519)
+++ trunk/Source/WebCore/platform/win/DragImageWin.cpp 2015-01-15 19:41:40 UTC (rev 178520)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #include "DragImage.h"
</span><span class="cx">
</span><span class="cx"> #include "FloatRoundedRect.h"
</span><del>-#include "Font.h"
</del><ins>+#include "FontCascade.h"
</ins><span class="cx"> #include "FontDescription.h"
</span><span class="cx"> #include "FontSelector.h"
</span><span class="cx"> #include "GraphicsContext.h"
</span><span class="lines">@@ -101,9 +101,9 @@
</span><span class="cx"> const float DragLinkLabelFontsize = 11;
</span><span class="cx"> const float DragLinkUrlFontSize = 10;
</span><span class="cx">
</span><del>-static Font dragLabelFont(int size, bool bold, FontRenderingMode renderingMode)
</del><ins>+static FontCascade dragLabelFont(int size, bool bold, FontRenderingMode renderingMode)
</ins><span class="cx"> {
</span><del>- Font result;
</del><ins>+ FontCascade result;
</ins><span class="cx"> NONCLIENTMETRICS metrics;
</span><span class="cx"> metrics.cbSize = sizeof(metrics);
</span><span class="cx"> SystemParametersInfo(SPI_GETNONCLIENTMETRICS, metrics.cbSize, &metrics, 0);
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> description.setSpecifiedSize((float)size);
</span><span class="cx"> description.setComputedSize((float)size);
</span><span class="cx"> description.setRenderingMode(renderingMode);
</span><del>- result = Font(description, 0, 0);
</del><ins>+ result = FontCascade(description, 0, 0);
</ins><span class="cx"> result.update(0);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -123,8 +123,8 @@
</span><span class="cx"> {
</span><span class="cx"> // This is more or less an exact match for the Mac OS X code.
</span><span class="cx">
</span><del>- const Font* labelFont;
- const Font* urlFont;
</del><ins>+ const FontCascade* labelFont;
+ const FontCascade* urlFont;
</ins><span class="cx">
</span><span class="cx"> if (fontRenderingMode == AlternateRenderingMode) {
</span><span class="cx"> static const Font alternateRenderingModeLabelFont = dragLabelFont(DragLinkLabelFontsize, true, AlternateRenderingMode);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinPopupMenuWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/PopupMenuWin.cpp (178519 => 178520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/PopupMenuWin.cpp 2015-01-15 19:34:51 UTC (rev 178519)
+++ trunk/Source/WebCore/platform/win/PopupMenuWin.cpp 2015-01-15 19:41:40 UTC (rev 178520)
</span><span class="lines">@@ -335,11 +335,11 @@
</span><span class="cx"> if (text.isEmpty())
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- Font itemFont = client()->menuStyle().font();
</del><ins>+ FontCascade itemFont = client()->menuStyle().font();
</ins><span class="cx"> if (client()->itemIsLabel(i)) {
</span><span class="cx"> FontDescription d = itemFont.fontDescription();
</span><span class="cx"> d.setWeight(d.bolderWeight());
</span><del>- itemFont = Font(d, itemFont.letterSpacing(), itemFont.wordSpacing());
</del><ins>+ itemFont = FontCascade(d, itemFont.letterSpacing(), itemFont.wordSpacing());
</ins><span class="cx"> itemFont.update(m_popupClient->fontSelector());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -641,11 +641,11 @@
</span><span class="cx"> TextRun textRun(itemText, 0, 0, TextRun::AllowTrailingExpansion, itemStyle.textDirection(), itemStyle.hasTextDirectionOverride());
</span><span class="cx"> context.setFillColor(optionTextColor, ColorSpaceDeviceRGB);
</span><span class="cx">
</span><del>- Font itemFont = client()->menuStyle().font();
</del><ins>+ FontCascade itemFont = client()->menuStyle().font();
</ins><span class="cx"> if (client()->itemIsLabel(index)) {
</span><span class="cx"> FontDescription d = itemFont.fontDescription();
</span><span class="cx"> d.setWeight(d.bolderWeight());
</span><del>- itemFont = Font(d, itemFont.letterSpacing(), itemFont.wordSpacing());
</del><ins>+ itemFont = FontCascade(d, itemFont.letterSpacing(), itemFont.wordSpacing());
</ins><span class="cx"> itemFont.update(m_popupClient->fontSelector());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinWebCoreTextRenderercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/WebCoreTextRenderer.cpp (178519 => 178520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/WebCoreTextRenderer.cpp 2015-01-15 19:34:51 UTC (rev 178519)
+++ trunk/Source/WebCore/platform/win/WebCoreTextRenderer.cpp 2015-01-15 19:41:40 UTC (rev 178520)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebCoreTextRenderer.h"
</span><span class="cx">
</span><del>-#include "Font.h"
</del><ins>+#include "FontCascade.h"
</ins><span class="cx"> #include "FontDescription.h"
</span><span class="cx"> #include "GraphicsContext.h"
</span><span class="cx"> #include "StringTruncator.h"
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void doDrawTextAtPoint(GraphicsContext& context, const String& text, const IntPoint& point, const Font& font, const Color& color, int underlinedIndex)
</del><ins>+static void doDrawTextAtPoint(GraphicsContext& context, const String& text, const IntPoint& point, const FontCascade& font, const Color& color, int underlinedIndex)
</ins><span class="cx"> {
</span><span class="cx"> TextRun run(text);
</span><span class="cx">
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCoreDrawDoubledTextAtPoint(GraphicsContext& context, const String& text, const IntPoint& point, const Font& font, const Color& topColor, const Color& bottomColor, int underlinedIndex)
</del><ins>+void WebCoreDrawDoubledTextAtPoint(GraphicsContext& context, const String& text, const IntPoint& point, const FontCascade& font, const Color& topColor, const Color& bottomColor, int underlinedIndex)
</ins><span class="cx"> {
</span><span class="cx"> context.save();
</span><span class="cx">
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> context.restore();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-float WebCoreTextFloatWidth(const String& text, const Font& font)
</del><ins>+float WebCoreTextFloatWidth(const String& text, const FontCascade& font)
</ins><span class="cx"> {
</span><span class="cx"> return StringTruncator::width(text, font, StringTruncator::EnableRoundingHacks);
</span><span class="cx"> }
</span><span class="lines">@@ -106,12 +106,12 @@
</span><span class="cx">
</span><span class="cx"> void WebCoreSetAlwaysUsesComplexTextCodePath(bool complex)
</span><span class="cx"> {
</span><del>- Font::setCodePath(complex ? Font::Complex : Font::Auto);
</del><ins>+ Font::setCodePath(complex ? FontCascade::Complex : FontCascade::Auto);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebCoreAlwaysUsesComplexTextCodePath()
</span><span class="cx"> {
</span><del>- return Font::codePath() == Font::Complex;
</del><ins>+ return Font::codePath() == FontCascade::Complex;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeSafaricpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeSafari.cpp (178519 => 178520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeSafari.cpp 2015-01-15 19:34:51 UTC (rev 178519)
+++ trunk/Source/WebCore/rendering/RenderThemeSafari.cpp 2015-01-15 19:41:40 UTC (rev 178520)
</span><span class="lines">@@ -401,7 +401,7 @@
</span><span class="cx"> style.setLineHeight(RenderStyle::initialLineHeight());
</span><span class="cx">
</span><span class="cx"> if (style.setFontDescription(fontDescription))
</span><del>- style.font().update(styleResolver.fontSelector());
</del><ins>+ style.fontCascade().update(styleResolver.fontSelector());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NSControlSize RenderThemeSafari::controlSizeForSystemFont(RenderStyle& style) const
</span></span></pre>
</div>
</div>
</body>
</html>