Title: [110857] trunk/Source/WebCore
- Revision
- 110857
- Author
- kev...@webkit.org
- Date
- 2012-03-15 10:14:35 -0700 (Thu, 15 Mar 2012)
Log Message
[wx] Unreviewed. Build fixes for Mac and DOM bindings.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (110856 => 110857)
--- trunk/Source/WebCore/ChangeLog 2012-03-15 16:55:38 UTC (rev 110856)
+++ trunk/Source/WebCore/ChangeLog 2012-03-15 17:14:35 UTC (rev 110857)
@@ -1,3 +1,12 @@
+2012-03-15 Kevin Ollivier <kev...@theolliviers.com>
+
+ [wx] Unreviewed. Build fixes for Mac and DOM bindings.
+
+ * bindings/cpp/WebDOMEventTarget.cpp:
+ (toWebKit):
+ * platform/graphics/mac/ComplexTextControllerCoreText.mm:
+ (WebCore::ComplexTextController::collectComplexTextRunsForCharactersCoreText):
+
2012-03-14 Pavel Podivilov <podivi...@chromium.org>
Web Inspector: extract CompilerScriptMapping from RawSourceCode.
Modified: trunk/Source/WebCore/bindings/cpp/WebDOMEventTarget.cpp (110856 => 110857)
--- trunk/Source/WebCore/bindings/cpp/WebDOMEventTarget.cpp 2012-03-15 16:55:38 UTC (rev 110856)
+++ trunk/Source/WebCore/bindings/cpp/WebDOMEventTarget.cpp 2012-03-15 17:14:35 UTC (rev 110857)
@@ -112,7 +112,7 @@
ConvertTo(Node)
ConvertTo(DOMWindow)
-#if ENABLE(WORKERS)
+#if ENABLE(WORKERS) && 0
ConvertTo(Worker)
ConvertTo(DedicatedWorkerContext)
#endif
@@ -150,7 +150,7 @@
return toWebKit(instance);
#endif
-#if ENABLE(WORKERS)
+#if ENABLE(WORKERS) && 0
if (WebCore::Worker* worker = value->toWorker())
return toWebKit(worker);
Modified: trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm (110856 => 110857)
--- trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2012-03-15 16:55:38 UTC (rev 110856)
+++ trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2012-03-15 17:14:35 UTC (rev 110857)
@@ -271,12 +271,17 @@
continue;
}
runFontData = fontCache()->getCachedFontData(m_font.fontDescription(), fontName.get(), false, FontCache::DoNotRetain);
+#if !PLATFORM(WX)
// Core Text may have used a font that is not known to NSFontManager. In that case, fall back on
// using the font as returned, even though it may not have the best NSFontRenderingMode.
if (!runFontData) {
FontPlatformData runFontPlatformData((NSFont *)runFont, CTFontGetSize(runFont));
runFontData = fontCache()->getCachedFontData(&runFontPlatformData, FontCache::DoNotRetain);
}
+#else
+ // just assert for now, until we can devise a better fix that works with wx.
+ ASSERT(runFontData);
+#endif
}
if (m_fallbackFonts && runFontData != m_font.primaryFont())
m_fallbackFonts->add(runFontData);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
