Roll out dominantScript, getGenericFontForScript patches to unfork a bunch of...

third_party/WebKit/WebCore/platform/graphics/mac/FontCacheMac.mm

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer. 
@@ skipping 20 matching lines @@
 #import "FontCache.h"
 
 #import "Font.h"
 #import "SimpleFontData.h"
 #import "FontPlatformData.h"
 #import "WebCoreSystemInterface.h"
 #import "WebFontCache.h"
 #import <AppKit/AppKit.h>
 #import <wtf/StdLibExtras.h>
 
-#if PLATFORM(CHROMIUM)
-#include "ChromiumBridge.h"
-#endif
-
 #ifdef BUILDING_ON_TIGER
 typedef int NSInteger;
 #endif
 
 namespace WebCore {
 
 static void fontCacheATSNotificationCallback(ATSFontNotificationInfoRef, void*)
 {
     fontCache()->invalidate();
 }
@@ skipping 141 matching lines @@
         actualTraits = [fontManager traitsOfFont:nsFont];
     NSInteger actualWeight = [fontManager weightOfFont:nsFont];
 
     NSFont *platformFont = fontDescription.usePrinterFont() ? [nsFont printerFont] : [nsFont screenFont];
     bool syntheticBold = isAppKitFontWeightBold(weight) && !isAppKitFontWeightBold(actualWeight);
     bool syntheticOblique = (traits & NSFontItalicTrait) && !(actualTraits & NSFontItalicTrait);
 
     return new FontPlatformData(platformFont, syntheticBold, syntheticOblique);
 }
 
-// TODO(jungshik): This may not be the best place to put this function. See FontCache.h.
-AtomicString FontCache::getGenericFontForScript(UScriptCode script, const FontDescription& description)
-{
-#if PLATFORM(CHROMIUM)
-    if (ChromiumBridge::layoutTestMode())
-        return emptyAtom;
-#endif
-    // TODO(pinkerton) -- flesh this out with some script handling code
-    return emptyAtom;
-}
-
 } // namespace WebCore
-
-