Title: [178525] trunk/Source/WebKit/win
- Revision
- 178525
- Author
- [email protected]
- Date
- 2015-01-15 12:28:10 -0800 (Thu, 15 Jan 2015)
Log Message
[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:
Modified Paths
Diff
Modified: trunk/Source/WebKit/win/ChangeLog (178524 => 178525)
--- 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)
@@ -1,3 +1,16 @@
+2015-01-15 Brent Fulgham <[email protected]>
+
+ [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:
+
2015-01-14 Chris Dumez <[email protected]>
Make 'TypeName' parameter unnecessary in CSSPropertyNames.in
Modified: trunk/Source/WebKit/win/DOMCoreClasses.cpp (178524 => 178525)
--- 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)
@@ -37,7 +37,7 @@
#include <WebCore/Document.h>
#include <WebCore/DragImage.h>
#include <WebCore/Element.h>
-#include <WebCore/Font.h>
+#include <WebCore/FontCascade.h>
#include <WebCore/Frame.h>
#include <WebCore/HTMLFormElement.h>
#include <WebCore/HTMLInputElement.h>
@@ -1254,7 +1254,7 @@
if (!renderer)
return E_FAIL;
- FontDescription fontDescription = renderer->style().font().fontDescription();
+ FontDescription fontDescription = renderer->style().fontCascade().fontDescription();
AtomicString family = fontDescription.firstFamily();
// FIXME: This leaks. Delete this whole function to get rid of the leak.
Modified: trunk/Source/WebKit/win/FullscreenVideoController.cpp (178524 => 178525)
--- 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)
@@ -34,7 +34,7 @@
#include <WebCore/BitmapInfo.h>
#include <WebCore/Chrome.h>
#include <WebCore/FloatRoundedRect.h>
-#include <WebCore/Font.h>
+#include <WebCore/FontCascade.h>
#include <WebCore/FontSelector.h>
#include <WebCore/GraphicsContext.h>
#include <WebCore/HWndDC.h>
@@ -515,7 +515,7 @@
desc.setOneFamily(metrics.lfSmCaptionFont.lfFaceName);
desc.setComputedSize(textSize);
- Font font = Font(desc, 0, 0);
+ FontCascade font = FontCascade(desc, 0, 0);
font.update(0);
String s;
Modified: trunk/Source/WebKit/win/WebKitGraphics.cpp (178524 => 178525)
--- 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)
@@ -30,7 +30,7 @@
#include "WebPreferences.h"
-#include <WebCore/Font.h>
+#include <WebCore/FontCascade.h>
#include <WebCore/FontDescription.h>
#include <WebCore/FontSelector.h>
#include <WebCore/GraphicsContext.h>
@@ -46,7 +46,7 @@
using namespace WebCore;
-static Font makeFont(const WebFontDescription& description)
+static FontCascade makeFont(const WebFontDescription& description)
{
AtomicString::init();
@@ -64,7 +64,7 @@
if (SUCCEEDED(WebPreferences::sharedStandardPreferences()->fontSmoothing(&smoothingType)))
f.setRenderingMode(smoothingType == FontSmoothingTypeWindows ? AlternateRenderingMode : NormalRenderingMode);
- Font font(f, 0, 0);
+ FontCascade font(f, 0, 0);
font.update(0);
return font;
@@ -96,7 +96,7 @@
if (!ascent && !descent && !lineSpacing)
return;
- Font font(makeFont(description));
+ FontCascade font(makeFont(description));
const WebCore::FontMetrics& fontMetrics(font.fontMetrics());
if (ascent)
Modified: trunk/Source/WebKit/win/WebPreferences.cpp (178524 => 178525)
--- 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)
@@ -33,7 +33,7 @@
#include <CoreFoundation/CoreFoundation.h>
#include <WebCore/COMPtr.h>
#include <WebCore/FileSystem.h>
-#include <WebCore/Font.h>
+#include <WebCore/FontCascade.h>
#include <WebCore/LocalizedStrings.h>
#include <limits>
#include <shlobj.h>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
