Title: [150718] trunk/Source/WebKit/win
- Revision
- 150718
- Author
- [email protected]
- Date
- 2013-05-26 08:15:09 -0700 (Sun, 26 May 2013)
Log Message
Another build fix.
Not reviewed.
* DOMCoreClasses.cpp:
(DOMElement::font):
* FullscreenVideoController.cpp:
(FullscreenVideoController::draw):
Modified Paths
Diff
Modified: trunk/Source/WebKit/win/ChangeLog (150717 => 150718)
--- trunk/Source/WebKit/win/ChangeLog 2013-05-26 15:11:34 UTC (rev 150717)
+++ trunk/Source/WebKit/win/ChangeLog 2013-05-26 15:15:09 UTC (rev 150718)
@@ -1,5 +1,16 @@
2013-05-26 Antti Koivisto <[email protected]>
+ Another build fix.
+
+ Not reviewed.
+
+ * DOMCoreClasses.cpp:
+ (DOMElement::font):
+ * FullscreenVideoController.cpp:
+ (FullscreenVideoController::draw):
+
+2013-05-26 Antti Koivisto <[email protected]>
+
Build fix
Not reviewed.
Modified: trunk/Source/WebKit/win/DOMCoreClasses.cpp (150717 => 150718)
--- trunk/Source/WebKit/win/DOMCoreClasses.cpp 2013-05-26 15:11:34 UTC (rev 150717)
+++ trunk/Source/WebKit/win/DOMCoreClasses.cpp 2013-05-26 15:15:09 UTC (rev 150718)
@@ -1255,7 +1255,7 @@
return E_FAIL;
FontDescription fontDescription = renderer->style()->font().fontDescription();
- AtomicString family = fontDescription.family().family();
+ AtomicString family = fontDescription.firstFamily();
webFontDescription->family = family.characters();
webFontDescription->familyLength = family.length();
webFontDescription->size = fontDescription.computedSize();
Modified: trunk/Source/WebKit/win/FullscreenVideoController.cpp (150717 => 150718)
--- trunk/Source/WebKit/win/FullscreenVideoController.cpp 2013-05-26 15:11:34 UTC (rev 150717)
+++ trunk/Source/WebKit/win/FullscreenVideoController.cpp 2013-05-26 15:15:09 UTC (rev 150718)
@@ -520,9 +520,7 @@
NONCLIENTMETRICS metrics;
metrics.cbSize = sizeof(metrics);
SystemParametersInfo(SPI_GETNONCLIENTMETRICS, metrics.cbSize, &metrics, 0);
- FontFamily family;
- family.setFamily(metrics.lfSmCaptionFont.lfFaceName);
- desc.setFamily(family);
+ desc.setOneFamily(metrics.lfSmCaptionFont.lfFaceName);
desc.setComputedSize(textSize);
Font font = Font(desc, 0, 0);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
