Title: [158102] trunk/Source
Revision
158102
Author
[email protected]
Date
2013-10-28 00:29:21 -0700 (Mon, 28 Oct 2013)

Log Message

Re-enable simple line layout for GTK
https://bugs.webkit.org/show_bug.cgi?id=123388

Reviewed by Andreas Kling.

Source/WebCore: 

* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::canUseFor): 8-bit TextRun support is now enabled for the GTK port, so the port
can use the simple line layout.

Source/WTF: 

* wtf/FeatureDefines.h: Enable the 8-bit TextRun support for the GTK port.

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (158101 => 158102)


--- trunk/Source/WTF/ChangeLog	2013-10-28 05:42:36 UTC (rev 158101)
+++ trunk/Source/WTF/ChangeLog	2013-10-28 07:29:21 UTC (rev 158102)
@@ -1,3 +1,12 @@
+2013-10-28  Zan Dobersek  <[email protected]>
+
+        Re-enable simple line layout for GTK
+        https://bugs.webkit.org/show_bug.cgi?id=123388
+
+        Reviewed by Andreas Kling.
+
+        * wtf/FeatureDefines.h: Enable the 8-bit TextRun support for the GTK port.
+
 2013-10-25  Joseph Pecoraro  <[email protected]>
 
         Upstream ENABLE(REMOTE_INSPECTOR) and enable on iOS and Mac

Modified: trunk/Source/WTF/wtf/FeatureDefines.h (158101 => 158102)


--- trunk/Source/WTF/wtf/FeatureDefines.h	2013-10-28 05:42:36 UTC (rev 158101)
+++ trunk/Source/WTF/wtf/FeatureDefines.h	2013-10-28 07:29:21 UTC (rev 158102)
@@ -299,6 +299,10 @@
 #endif
 #endif
 
+#if !defined(ENABLE_8BIT_TEXTRUN)
+#define ENABLE_8BIT_TEXTRUN 1
+#endif
+
 #endif /* PLATFORM(GTK) */
 
 /* --------- Blackberry port (QNX) --------- */

Modified: trunk/Source/WebCore/ChangeLog (158101 => 158102)


--- trunk/Source/WebCore/ChangeLog	2013-10-28 05:42:36 UTC (rev 158101)
+++ trunk/Source/WebCore/ChangeLog	2013-10-28 07:29:21 UTC (rev 158102)
@@ -1,3 +1,14 @@
+2013-10-28  Zan Dobersek  <[email protected]>
+
+        Re-enable simple line layout for GTK
+        https://bugs.webkit.org/show_bug.cgi?id=123388
+
+        Reviewed by Andreas Kling.
+
+        * rendering/SimpleLineLayout.cpp:
+        (WebCore::SimpleLineLayout::canUseFor): 8-bit TextRun support is now enabled for the GTK port, so the port
+        can use the simple line layout.
+
 2013-10-27  Andreas Kling  <[email protected]>
 
         Fix 4 asserting SVG tests after r158097.

Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (158101 => 158102)


--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp	2013-10-28 05:42:36 UTC (rev 158101)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp	2013-10-28 07:29:21 UTC (rev 158102)
@@ -54,7 +54,7 @@
 
 bool canUseFor(const RenderBlockFlow& flow)
 {
-#if !PLATFORM(MAC)
+#if !PLATFORM(MAC) && !PLATFORM(GTK)
     // FIXME: Non-mac platforms are hitting ASSERT(run.charactersLength() >= run.length())
     // https://bugs.webkit.org/show_bug.cgi?id=123338
     return false;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to