Finish removing WebKitSystemInterface from Blink.

Source/core/platform/graphics/mac/GlyphPageTreeNodeMac.cpp

 /*
  * Copyright (C) 2006, 2007 Apple 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer. 
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 14 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/platform/graphics/GlyphPageTreeNode.h"
 
 #include <ApplicationServices/ApplicationServices.h>
 #include "core/platform/graphics/Font.h"
 #include "core/platform/graphics/SimpleFontData.h"
-#include "core/platform/mac/WebCoreSystemInterface.h"
 
 // Forward declare Mac SPIs.
 // Request for public API: rdar://13787589
 extern "C" {
 void CGFontGetGlyphsForUnichars(CGFontRef font, const UniChar chars[], CGGlyph glyphs[], size_t length);
 }
 
 namespace WebCore {
 
 static bool shouldUseCoreText(UChar* buffer, unsigned bufferLength, const SimpleFontData* fontData)
@@ skipping 19 matching lines @@
     if (!shouldUseCoreText(buffer, bufferLength, fontData)) {
         CGFontGetGlyphsForUnichars(fontData->platformData().cgFont(), buffer, glyphs.data(), bufferLength);
         for (unsigned i = 0; i < length; ++i) {
             if (!glyphs[i])
                 setGlyphDataForIndex(offset + i, 0, 0);
             else {
                 setGlyphDataForIndex(offset + i, glyphs[i], fontData);
                 haveGlyphs = true;
             }
         }
-    } else if (!fontData->platformData().isCompositeFontReference() && ((fontData->platformData().widthVariant() == RegularWidth) ? WKGetVerticalGlyphsForCharacters(fontData->platformData().ctFont(), buffer, glyphs.data(), bufferLength)

[Nico, 2013/05/03 17:16:51]

This looks like a behavior change, not just like a replacement?

[Robert Sesek, 2013/05/03 17:58:03]

Sorry, I forgot to call that out. The function does nothing:

_WKGetVerticalGlyphsForCharacters:
00000069        pushl   %ebp
0000006a        movl    %esp, %ebp
0000006c        xorl    %eax, %eax
0000006e        leave
0000006f        ret

-               : CTFontGetGlyphsForCharacters(fontData->platformData().ctFont(), buffer, glyphs.data(), bufferLength))) {
-        // When buffer consists of surrogate pairs, WKGetVerticalGlyphsForCharacters and CTFontGetGlyphsForCharacters
-        // place the glyphs at indices corresponding to the first character of each pair.
+    } else if (!fontData->platformData().isCompositeFontReference() && fontData->platformData().widthVariant() != RegularWidth
+               && CTFontGetGlyphsForCharacters(fontData->platformData().ctFont(), buffer, glyphs.data(), bufferLength)) {
+        // When buffer consists of surrogate pairs, CTFontGetGlyphsForCharacters
+        // places the glyphs at indices corresponding to the first character of each pair.
         unsigned glyphStep = bufferLength / length;
         for (unsigned i = 0; i < length; ++i) {
             if (!glyphs[i * glyphStep])
                 setGlyphDataForIndex(offset + i, 0, 0);
             else {
                 setGlyphDataForIndex(offset + i, glyphs[i * glyphStep], fontData);
                 haveGlyphs = true;
             }
         }
     } else {
@@ skipping 71 matching lines @@
                     }
                 }
             }
         }
     }
 
     return haveGlyphs;
 }
 
 } // namespace WebCore