Title: [110528] trunk/Source/WebCore
Revision
110528
Author
[email protected]
Date
2012-03-12 19:17:32 -0700 (Mon, 12 Mar 2012)

Log Message

[BlackBerry] Upstream the BlackBerry change to platform/graphics/FontPlatformData.h
https://bugs.webkit.org/show_bug.cgi?id=80820

Reviewed by Rob Buis.

The BlackBerry is using the FontPlatformData from Chromium porting.

* platform/graphics/FontPlatformData.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (110527 => 110528)


--- trunk/Source/WebCore/ChangeLog	2012-03-13 01:58:27 UTC (rev 110527)
+++ trunk/Source/WebCore/ChangeLog	2012-03-13 02:17:32 UTC (rev 110528)
@@ -1,3 +1,14 @@
+2012-03-12  Leo Yang  <[email protected]>
+
+        [BlackBerry] Upstream the BlackBerry change to platform/graphics/FontPlatformData.h
+        https://bugs.webkit.org/show_bug.cgi?id=80820
+
+        Reviewed by Rob Buis.
+
+        The BlackBerry is using the FontPlatformData from Chromium porting.
+
+        * platform/graphics/FontPlatformData.h:
+
 2012-03-12  Zhenyao Mo  <[email protected]>
 
         After webgl canvas resize, bindings might be lost

Modified: trunk/Source/WebCore/platform/graphics/FontPlatformData.h (110527 => 110528)


--- trunk/Source/WebCore/platform/graphics/FontPlatformData.h	2012-03-13 01:58:27 UTC (rev 110527)
+++ trunk/Source/WebCore/platform/graphics/FontPlatformData.h	2012-03-13 02:17:32 UTC (rev 110528)
@@ -23,7 +23,7 @@
  */
 
 // FIXME: This is temporary until all ports switch to using this file.
-#if PLATFORM(CHROMIUM) && !OS(DARWIN)
+#if (PLATFORM(CHROMIUM) && !OS(DARWIN)) || PLATFORM(BLACKBERRY)
 #include "chromium/FontPlatformData.h"
 #elif PLATFORM(QT)
 #include "qt/FontPlatformData.h"
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to