Changeset 70675 in webkit

Timestamp:

Oct 27, 2010 11:05:20 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-10-27 Kwang Yul Seo <​skyul@company100.net>

Reviewed by James Robinson.

[BREWMP] Port graphics backend
​https://bugs.webkit.org/show_bug.cgi?id=40275

Add PLATFORM(BREWMP) guard to skia's FontCustomPlatformData
to share OS(LINUX) implementation.

• loader/CachedFont.cpp:
• platform/graphics/skia/FontCustomPlatformData.cpp: (WebCore::FontCustomPlatformData::~FontCustomPlatformData): (WebCore::FontCustomPlatformData::fontPlatformData): (WebCore::createFontCustomPlatformData):
• platform/graphics/skia/FontCustomPlatformData.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/CachedFont.cpp (modified) (1 diff)
• platform/graphics/skia/FontCustomPlatformData.cpp (modified) (7 diffs)
• platform/graphics/skia/FontCustomPlatformData.h (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-27  Kwang Yul Seo  <skyul@company100.net>
+
+        Reviewed by James Robinson.
+
+        [BREWMP] Port graphics backend
+        https://bugs.webkit.org/show_bug.cgi?id=40275
+
+        Add PLATFORM(BREWMP) guard to skia's FontCustomPlatformData
+        to share OS(LINUX) implementation.
+
+        * loader/CachedFont.cpp:
+        * platform/graphics/skia/FontCustomPlatformData.cpp:
+        (WebCore::FontCustomPlatformData::~FontCustomPlatformData):
+        (WebCore::FontCustomPlatformData::fontPlatformData):
+        (WebCore::createFontCustomPlatformData):
+        * platform/graphics/skia/FontCustomPlatformData.h:
+
 2010-10-27  Satish Sampath  <satish@chromium.org>
 

trunk/WebCore/loader/CachedFont.cpp

@@ -28 +28 @@
 #include "CachedFont.h"
 
-#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (OS(WINDOWS) || OS(LINUX) || OS(FREEBSD))) || PLATFORM(HAIKU) || OS(WINCE) || PLATFORM(ANDROID)
+#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (OS(WINDOWS) || OS(LINUX) || OS(FREEBSD))) || PLATFORM(HAIKU) || OS(WINCE) || PLATFORM(ANDROID) || PLATFORM(BREWMP)
 #define STORE_FONT_CUSTOM_PLATFORM_DATA
 #endif

trunk/WebCore/platform/graphics/skia/FontCustomPlatformData.cpp

@@ -2 +2 @@
  * Copyright (C) 2007 Apple Computer, Inc.
  * Copyright (c) 2007, 2008, 2009, Google Inc. All rights reserved.
+ * Copyright (C) 2010 Company 100, Inc.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -37 +38 @@
 #include "ChromiumBridge.h"
 #include "OpenTypeUtilities.h"
-#elif OS(LINUX) || OS(FREEBSD)
+#elif OS(LINUX) || OS(FREEBSD) || PLATFORM(BREWMP)
 #include "SkStream.h"
 #endif
@@ -48 +49 @@
 #if OS(WINDOWS)
 #include <objbase.h>
-#elif OS(LINUX) || OS(FREEBSD)
+#elif OS(LINUX) || OS(FREEBSD) || PLATFORM(BREWMP)
 #include <cstring>
 #endif
@@ -59 +60 @@
     if (m_fontReference)
         RemoveFontMemResourceEx(m_fontReference);
-#elif OS(LINUX) || OS(FREEBSD)
+#elif OS(LINUX) || OS(FREEBSD) || PLATFORM(BREWMP)
     if (m_fontReference)
         m_fontReference->unref();
@@ -100 +101 @@
     HFONT hfont = CreateFontIndirect(&logFont);
     return FontPlatformData(hfont, size);
-#elif OS(LINUX) || OS(FREEBSD)
+#elif OS(LINUX) || OS(FREEBSD) || PLATFORM(BREWMP)
     ASSERT(m_fontReference);
     return FontPlatformData(m_fontReference, "", size, bold && !m_fontReference->isBold(), italic && !m_fontReference->isItalic());
@@ -124 +125 @@
 #endif
 
-#if OS(LINUX) || OS(FREEBSD)
+#if OS(LINUX) || OS(FREEBSD) || PLATFORM(BREWMP)
 class RemoteFontStream : public SkStream {
 public:
@@ -190 +191 @@
         return 0;
     return new FontCustomPlatformData(fontReference, fontName);
-#elif OS(LINUX) || OS(FREEBSD)
+#elif OS(LINUX) || OS(FREEBSD) || PLATFORM(BREWMP)
     RemoteFontStream* stream = new RemoteFontStream(buffer);
     SkTypeface* typeface = SkTypeface::CreateFromStream(stream);

trunk/WebCore/platform/graphics/skia/FontCustomPlatformData.h

@@ -41 +41 @@
 #include "PlatformString.h"
 #include <windows.h>
-#elif OS(LINUX) || OS(FREEBSD)
+#elif OS(LINUX) || OS(FREEBSD) || PLATFORM(BREWMP)
 #include "SkTypeface.h"
 #endif
@@ -56 +56 @@
         , m_name(name)
     {}
-#elif OS(LINUX) || OS(FREEBSD)
+#elif OS(LINUX) || OS(FREEBSD) || PLATFORM(BREWMP)
     explicit FontCustomPlatformData(SkTypeface* typeface)
         : m_fontReference(typeface)
@@ -72 +72 @@
     HANDLE m_fontReference;
     String m_name;
-#elif OS(LINUX) || OS(FREEBSD)
+#elif OS(LINUX) || OS(FREEBSD) || PLATFORM(BREWMP)
     SkTypeface* m_fontReference;
 #endif