Title: [158086] trunk/Source/WebCore
- Revision
- 158086
- Author
- mark....@apple.com
- Date
- 2013-10-26 09:11:17 -0700 (Sat, 26 Oct 2013)
Log Message
Gardening: fixed broken build.
https://bugs.webkit.org/show_bug.cgi?id=123354.
* css/CSSFontSelector.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (158085 => 158086)
--- trunk/Source/WebCore/ChangeLog 2013-10-26 15:44:26 UTC (rev 158085)
+++ trunk/Source/WebCore/ChangeLog 2013-10-26 16:11:17 UTC (rev 158086)
@@ -1,3 +1,10 @@
+2013-10-26 Mark Lam <mark....@apple.com>
+
+ Gardening: fixed broken build.
+ https://bugs.webkit.org/show_bug.cgi?id=123354.
+
+ * css/CSSFontSelector.h:
+
2013-10-26 Antti Koivisto <an...@apple.com>
fast/frames/seamless/seamless-nested-crash.html asserts on wk2 only
Modified: trunk/Source/WebCore/css/CSSFontSelector.h (158085 => 158086)
--- trunk/Source/WebCore/css/CSSFontSelector.h 2013-10-26 15:44:26 UTC (rev 158085)
+++ trunk/Source/WebCore/css/CSSFontSelector.h 2013-10-26 16:11:17 UTC (rev 158086)
@@ -28,6 +28,7 @@
#include "CachedResourceHandle.h"
#include "FontSelector.h"
+#include "SimpleFontData.h"
#include "Timer.h"
#include <wtf/Forward.h>
#include <wtf/HashMap.h>
@@ -60,7 +61,7 @@
virtual size_t fallbackFontDataCount() OVERRIDE;
virtual PassRefPtr<FontData> getFallbackFontData(const FontDescription&, size_t) OVERRIDE;
CSSSegmentedFontFace* getFontFace(const FontDescription&, const AtomicString& family);
- virtual PassRefPtr<SimpleFontData> userStandardFont(const FontDescription&) OVERRIDE;
+ virtual PassRefPtr<SimpleFontData> userStandardFont(const FontDescription&);
virtual bool resolvesFamilyFor(const FontDescription&) const OVERRIDE;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
