[wx] Unreviewed. Build fixes for Mac and DOM bindings.
authorkevino@webkit.org <kevino@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Mar 2012 17:14:35 +0000 (17:14 +0000)
committerkevino@webkit.org <kevino@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Mar 2012 17:14:35 +0000 (17:14 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@110857 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/bindings/cpp/WebDOMEventTarget.cpp
Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm

index d527cd8..0e54633 100644 (file)
@@ -1,3 +1,12 @@
+2012-03-15  Kevin Ollivier  <kevino@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  <podivilov@chromium.org>
 
         Web Inspector: extract CompilerScriptMapping from RawSourceCode.
index 17344fc..ae40d51 100644 (file)
@@ -112,7 +112,7 @@ WebDOM##type WebDOMEventTarget::to##type() \
 ConvertTo(Node)
 ConvertTo(DOMWindow)
 
-#if ENABLE(WORKERS)
+#if ENABLE(WORKERS) && 0
 ConvertTo(Worker)
 ConvertTo(DedicatedWorkerContext)
 #endif
@@ -150,7 +150,7 @@ WebDOMEventTarget toWebKit(WebCore::EventTarget* value)
         return toWebKit(instance);
 #endif
 
-#if ENABLE(WORKERS)
+#if ENABLE(WORKERS) && 0
     if (WebCore::Worker* worker = value->toWorker())
         return toWebKit(worker);
 
index 0c7ad1b..673c414 100644 (file)
@@ -271,12 +271,17 @@ void ComplexTextController::collectComplexTextRunsForCharactersCoreText(const UC
                         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);