Changeset 94874 in webkit

Timestamp:

Sep 9, 2011 2:40:04 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Rename FontGtk.cpp to FontPango.cpp
​https://bugs.webkit.org/show_bug.cgi?id=66323

Patch by Rafael Antognolli <​antognolli@profusion.mobi> on 2011-09-09
Reviewed by Martin Robinson.

This file will be used by the EFL port too, and since it's not GTK
specific anymore, rename it to something better.

No new functionality so no new tests.

• GNUmakefile.list.am:
• platform/graphics/pango/FontPango.cpp: Renamed from Source/WebCore/platform/graphics/gtk/FontGtk.cpp.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.list.am (modified) (3 diffs)
• platform/graphics/pango/FontPango.cpp (moved) (moved from trunk/Source/WebCore/platform/graphics/gtk/FontGtk.cpp) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-09  Rafael Antognolli  <antognolli@profusion.mobi>
+
+        Rename FontGtk.cpp to FontPango.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=66323
+
+        Reviewed by Martin Robinson.
+
+        This file will be used by the EFL port too, and since it's not GTK
+        specific anymore, rename it to something better.
+
+        No new functionality so no new tests.
+
+        * GNUmakefile.list.am:
+        * platform/graphics/pango/FontPango.cpp: Renamed from Source/WebCore/platform/graphics/gtk/FontGtk.cpp.
+
 2011-09-09  Adam Klein  <adamk@chromium.org>
 

trunk/Source/WebCore/GNUmakefile.list.am

@@ -3960 +3960 @@
         Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.h \
         Source/WebCore/platform/graphics/gtk/ColorGtk.cpp \
-        Source/WebCore/platform/graphics/gtk/FontGtk.cpp \
         Source/WebCore/platform/graphics/gtk/GdkCairoUtilities.cpp \
         Source/WebCore/platform/graphics/gtk/GdkCairoUtilities.h \
@@ -4086 +4085 @@
         Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp
 webcoregtk_sources += \
+        Source/WebCore/platform/graphics/pango/FontPango.cpp \
         Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp
 endif # END USE_FREETYPE
@@ -4100 +4100 @@
         Source/WebCore/platform/graphics/pango/GlyphPageTreeNodePango.cpp \
         Source/WebCore/platform/graphics/pango/SimpleFontDataPango.cpp
+webcoregtk_sources += \
+        Source/WebCore/platform/graphics/pango/FontPango.cpp
 endif # END USE_PANGO
 

trunk/Source/WebCore/platform/graphics/pango/FontPango.cpp

@@ -335 +335 @@
 {
     static PangoFontMap* map = pango_cairo_font_map_get_default();
-#if PANGO_VERSION_CHECK(1,21,5)
+#if PANGO_VERSION_CHECK(1, 21, 5)
     static PangoContext* pangoContext = pango_font_map_create_context(map);
 #else
@@ -353 +353 @@
 #endif
 
-    if (run.length() == 0)
+    if (!run.length())
         return 0.0f;
 
@@ -424 +424 @@
 
     PangoLayoutLine* layoutLine = pango_layout_get_line_readonly(layout, 0);
-    int x_pos;
-
-    x_pos = 0;
+    int xPos;
+
+    xPos = 0;
     if (from < layoutLine->length)
-        pango_layout_line_index_to_x(layoutLine, from, FALSE, &x_pos);
-    float beforeWidth = PANGO_PIXELS_FLOOR(x_pos);
-
-    x_pos = 0;
+        pango_layout_line_index_to_x(layoutLine, from, FALSE, &xPos);
+    float beforeWidth = PANGO_PIXELS_FLOOR(xPos);
+
+    xPos = 0;
     if (run.ltr() || to < layoutLine->length)
-        pango_layout_line_index_to_x(layoutLine, to, FALSE, &x_pos);
-    float afterWidth = PANGO_PIXELS(x_pos);
+        pango_layout_line_index_to_x(layoutLine, to, FALSE, &xPos);
+    float afterWidth = PANGO_PIXELS(xPos);
 
     g_free(utf8);