Diff
Modified: trunk/Source/WebCore/ChangeLog (178520 => 178521)
--- trunk/Source/WebCore/ChangeLog 2015-01-15 19:41:40 UTC (rev 178520)
+++ trunk/Source/WebCore/ChangeLog 2015-01-15 19:54:42 UTC (rev 178521)
@@ -1,3 +1,11 @@
+2015-01-15 Brent Fulgham <[email protected]>
+
+ [Win] Unreviewed build fix.
+
+ * platform/graphics/win/FontCacheWin.cpp:
+ * platform/win/DragImageWin.cpp:
+ * platform/win/WebCoreTextRenderer.h:
+
2015-01-15 Antti Koivisto <[email protected]>
Try to fix windows build.
Modified: trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp (178520 => 178521)
--- trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp 2015-01-15 19:41:40 UTC (rev 178520)
+++ trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp 2015-01-15 19:54:42 UTC (rev 178521)
@@ -33,6 +33,7 @@
#include "SimpleFontData.h"
#include <mlang.h>
#include <windows.h>
+#include <wtf/HashSet.h>
#include <wtf/StdLibExtras.h>
#include <wtf/text/CString.h>
#include <wtf/text/StringHash.h>
Modified: trunk/Source/WebCore/platform/win/DragImageWin.cpp (178520 => 178521)
--- trunk/Source/WebCore/platform/win/DragImageWin.cpp 2015-01-15 19:41:40 UTC (rev 178520)
+++ trunk/Source/WebCore/platform/win/DragImageWin.cpp 2015-01-15 19:54:42 UTC (rev 178521)
@@ -127,13 +127,13 @@
const FontCascade* urlFont;
if (fontRenderingMode == AlternateRenderingMode) {
- static const Font alternateRenderingModeLabelFont = dragLabelFont(DragLinkLabelFontsize, true, AlternateRenderingMode);
- static const Font alternateRenderingModeURLFont = dragLabelFont(DragLinkUrlFontSize, false, AlternateRenderingMode);
+ static const FontCascade alternateRenderingModeLabelFont = dragLabelFont(DragLinkLabelFontsize, true, AlternateRenderingMode);
+ static const FontCascade alternateRenderingModeURLFont = dragLabelFont(DragLinkUrlFontSize, false, AlternateRenderingMode);
labelFont = &alternateRenderingModeLabelFont;
urlFont = &alternateRenderingModeURLFont;
} else {
- static const Font normalRenderingModeLabelFont = dragLabelFont(DragLinkLabelFontsize, true, NormalRenderingMode);
- static const Font normalRenderingModeURLFont = dragLabelFont(DragLinkUrlFontSize, false, NormalRenderingMode);
+ static const FontCascade normalRenderingModeLabelFont = dragLabelFont(DragLinkLabelFontsize, true, NormalRenderingMode);
+ static const FontCascade normalRenderingModeURLFont = dragLabelFont(DragLinkUrlFontSize, false, NormalRenderingMode);
labelFont = &normalRenderingModeLabelFont;
urlFont = &normalRenderingModeURLFont;
}
Modified: trunk/Source/WebCore/platform/win/WebCoreTextRenderer.h (178520 => 178521)
--- trunk/Source/WebCore/platform/win/WebCoreTextRenderer.h 2015-01-15 19:41:40 UTC (rev 178520)
+++ trunk/Source/WebCore/platform/win/WebCoreTextRenderer.h 2015-01-15 19:54:42 UTC (rev 178521)
@@ -31,12 +31,12 @@
namespace WebCore {
class Color;
- class Font;
+ class FontCascade;
class GraphicsContext;
class IntPoint;
- void WebCoreDrawDoubledTextAtPoint(GraphicsContext&, const String&, const IntPoint&, const Font&, const Color& topColor, const Color& bottomColor, int underlinedIndex = -1);
- float WebCoreTextFloatWidth(const String&, const Font&);
+ void WebCoreDrawDoubledTextAtPoint(GraphicsContext&, const String&, const IntPoint&, const FontCascade&, const Color& topColor, const Color& bottomColor, int underlinedIndex = -1);
+ float WebCoreTextFloatWidth(const String&, const FontCascade&);
void WebCoreSetShouldUseFontSmoothing(bool);
bool WebCoreShouldUseFontSmoothing();
