<!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>[178525] 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/178525">178525</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-01-15 12:28:10 -0800 (Thu, 15 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Unreviewed build fix after <a href="http://trac.webkit.org/projects/webkit/changeset/178510">r178510</a>
Correct #include and declarations from Font->FontCascade
* DOMCoreClasses.cpp:
(DOMElement::font):
* FullscreenVideoController.cpp:
(FullscreenVideoController::draw):
* WebKitGraphics.cpp:
* WebPreferences.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinDOMCoreClassescpp">trunk/Source/WebKit/win/DOMCoreClasses.cpp</a></li>
<li><a href="#trunkSourceWebKitwinFullscreenVideoControllercpp">trunk/Source/WebKit/win/FullscreenVideoController.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebKitGraphicscpp">trunk/Source/WebKit/win/WebKitGraphics.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebPreferencescpp">trunk/Source/WebKit/win/WebPreferences.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 (178524 => 178525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-01-15 20:24:41 UTC (rev 178524)
+++ trunk/Source/WebKit/win/ChangeLog 2015-01-15 20:28:10 UTC (rev 178525)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-01-15 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Unreviewed build fix after r178510
+
+ Correct #include and declarations from Font->FontCascade
+
+ * DOMCoreClasses.cpp:
+ (DOMElement::font):
+ * FullscreenVideoController.cpp:
+ (FullscreenVideoController::draw):
+ * WebKitGraphics.cpp:
+ * WebPreferences.cpp:
+
</ins><span class="cx"> 2015-01-14 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Make 'TypeName' parameter unnecessary in CSSPropertyNames.in
</span></span></pre></div>
<a id="trunkSourceWebKitwinDOMCoreClassescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/DOMCoreClasses.cpp (178524 => 178525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/DOMCoreClasses.cpp 2015-01-15 20:24:41 UTC (rev 178524)
+++ trunk/Source/WebKit/win/DOMCoreClasses.cpp 2015-01-15 20:28:10 UTC (rev 178525)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> #include <WebCore/Document.h>
</span><span class="cx"> #include <WebCore/DragImage.h>
</span><span class="cx"> #include <WebCore/Element.h>
</span><del>-#include <WebCore/Font.h>
</del><ins>+#include <WebCore/FontCascade.h>
</ins><span class="cx"> #include <WebCore/Frame.h>
</span><span class="cx"> #include <WebCore/HTMLFormElement.h>
</span><span class="cx"> #include <WebCore/HTMLInputElement.h>
</span><span class="lines">@@ -1254,7 +1254,7 @@
</span><span class="cx"> if (!renderer)
</span><span class="cx"> return E_FAIL;
</span><span class="cx">
</span><del>- FontDescription fontDescription = renderer->style().font().fontDescription();
</del><ins>+ FontDescription fontDescription = renderer->style().fontCascade().fontDescription();
</ins><span class="cx"> AtomicString family = fontDescription.firstFamily();
</span><span class="cx">
</span><span class="cx"> // FIXME: This leaks. Delete this whole function to get rid of the leak.
</span></span></pre></div>
<a id="trunkSourceWebKitwinFullscreenVideoControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/FullscreenVideoController.cpp (178524 => 178525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/FullscreenVideoController.cpp 2015-01-15 20:24:41 UTC (rev 178524)
+++ trunk/Source/WebKit/win/FullscreenVideoController.cpp 2015-01-15 20:28:10 UTC (rev 178525)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #include <WebCore/BitmapInfo.h>
</span><span class="cx"> #include <WebCore/Chrome.h>
</span><span class="cx"> #include <WebCore/FloatRoundedRect.h>
</span><del>-#include <WebCore/Font.h>
</del><ins>+#include <WebCore/FontCascade.h>
</ins><span class="cx"> #include <WebCore/FontSelector.h>
</span><span class="cx"> #include <WebCore/GraphicsContext.h>
</span><span class="cx"> #include <WebCore/HWndDC.h>
</span><span class="lines">@@ -515,7 +515,7 @@
</span><span class="cx"> desc.setOneFamily(metrics.lfSmCaptionFont.lfFaceName);
</span><span class="cx">
</span><span class="cx"> desc.setComputedSize(textSize);
</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"> String s;
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebKitGraphicscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebKitGraphics.cpp (178524 => 178525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebKitGraphics.cpp 2015-01-15 20:24:41 UTC (rev 178524)
+++ trunk/Source/WebKit/win/WebKitGraphics.cpp 2015-01-15 20:28:10 UTC (rev 178525)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include "WebPreferences.h"
</span><span class="cx">
</span><del>-#include <WebCore/Font.h>
</del><ins>+#include <WebCore/FontCascade.h>
</ins><span class="cx"> #include <WebCore/FontDescription.h>
</span><span class="cx"> #include <WebCore/FontSelector.h>
</span><span class="cx"> #include <WebCore/GraphicsContext.h>
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><del>-static Font makeFont(const WebFontDescription& description)
</del><ins>+static FontCascade makeFont(const WebFontDescription& description)
</ins><span class="cx"> {
</span><span class="cx"> AtomicString::init();
</span><span class="cx">
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> if (SUCCEEDED(WebPreferences::sharedStandardPreferences()->fontSmoothing(&smoothingType)))
</span><span class="cx"> f.setRenderingMode(smoothingType == FontSmoothingTypeWindows ? AlternateRenderingMode : NormalRenderingMode);
</span><span class="cx">
</span><del>- Font font(f, 0, 0);
</del><ins>+ FontCascade font(f, 0, 0);
</ins><span class="cx"> font.update(0);
</span><span class="cx">
</span><span class="cx"> return font;
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> if (!ascent && !descent && !lineSpacing)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- Font font(makeFont(description));
</del><ins>+ FontCascade font(makeFont(description));
</ins><span class="cx"> const WebCore::FontMetrics& fontMetrics(font.fontMetrics());
</span><span class="cx">
</span><span class="cx"> if (ascent)
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebPreferences.cpp (178524 => 178525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebPreferences.cpp 2015-01-15 20:24:41 UTC (rev 178524)
+++ trunk/Source/WebKit/win/WebPreferences.cpp 2015-01-15 20:28:10 UTC (rev 178525)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> #include <CoreFoundation/CoreFoundation.h>
</span><span class="cx"> #include <WebCore/COMPtr.h>
</span><span class="cx"> #include <WebCore/FileSystem.h>
</span><del>-#include <WebCore/Font.h>
</del><ins>+#include <WebCore/FontCascade.h>
</ins><span class="cx"> #include <WebCore/LocalizedStrings.h>
</span><span class="cx"> #include <limits>
</span><span class="cx"> #include <shlobj.h>
</span></span></pre>
</div>
</div>
</body>
</html>