Minor sky/engine updates for Mac target

sky/engine/platform/fonts/skia/FontCacheSkia.cpp

 /*
  * Copyright (c) 2006, 2007, 2008, 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 31 matching lines @@
 #include "sky/engine/wtf/text/AtomicString.h"
 #include "sky/engine/wtf/text/CString.h"
 #include "third_party/skia/include/core/SkStream.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "third_party/skia/include/ports/SkFontMgr.h"
 
 #if !OS(WIN) && !OS(ANDROID)
 #include "third_party/skia/include/ports/SkFontConfigInterface.h"
 #endif
 
-#if !OS(WIN) && !OS(ANDROID) && !OS(IOS)
+#if !OS(WIN) && !OS(ANDROID) && !OS(IOS) && !OS(MACOSX)
 // TODO(bungeman) remove this temporary code ASAP.
 // This namespace exists to ease transition of SkTypeface from using SkStream to SkStreamAsset.
 namespace tmp {
 // Like std::declval but only returns lvalue references, ok since it isn't used on rvalue references.
 template<typename T> T& declvall();
 // The return type of SkFontConfigInterface::openStream(const SkFontConfigInterface::FontIdentity&).
 using StreamType = decltype(tmp::declvall<SkFontConfigInterface>().openStream(tmp::declvall<const SkFontConfigInterface::FontIdentity&>()));
 }
 static tmp::StreamType streamForFontconfigInterfaceId(int fontconfigInterfaceId)
 {
@@ skipping 145 matching lines @@
         DEFINE_STATIC_LOCAL(const FontFaceCreationParams, arialCreationParams, (AtomicString("Arial", AtomicString::ConstructFromLiteral)));
         fontPlatformData = getFontPlatformData(description, arialCreationParams);
     }
 
     ASSERT(fontPlatformData);
     return fontDataFromFontPlatformData(fontPlatformData, shouldRetain);
 }
 
 PassRefPtr<SkTypeface> FontCache::createTypeface(const FontDescription& fontDescription, const FontFaceCreationParams& creationParams, CString& name)
 {
-#if !OS(WIN) && !OS(ANDROID) && !OS(IOS)
+#if !OS(WIN) && !OS(ANDROID) && !OS(IOS) && !OS(MACOSX)
     if (creationParams.creationType() == CreateFontByFciIdAndTtcIndex) {
         // TODO(dro): crbug.com/381620 Use creationParams.ttcIndex() after
         // https://code.google.com/p/skia/issues/detail?id=1186 gets fixed.
         SkTypeface* typeface = nullptr;
         if (Platform::current()->sandboxSupport())
             typeface = SkTypeface::CreateFromStream(streamForFontconfigInterfaceId(creationParams.fontconfigInterfaceId()));
         else
             typeface = SkTypeface::CreateFromFile(creationParams.filename().data());
 
         if (typeface)
@@ skipping 44 matching lines @@
         fontSize,
         (fontDescription.weight() >= FontWeight600 && !tf->isBold()) || fontDescription.isSyntheticBold(),
         (fontDescription.style() && !tf->isItalic()) || fontDescription.isSyntheticItalic(),
         fontDescription.orientation(),
         fontDescription.useSubpixelPositioning());
     return result;
 }
 #endif // !OS(WIN)
 
 } // namespace blink