Changeset 158007 in webkit

Timestamp:

Oct 25, 2013 6:46:55 AM (10 years ago)

Author:

Antti Koivisto

Message:

REGRESSION(r157950): It made many tests assert on Windows, EFL, GTK
​https://bugs.webkit.org/show_bug.cgi?id=123309

Reviewed by Andreas Kling.

Disable simple line layout on non-Mac plaforms for now.

• rendering/SimpleLineLayout.cpp:

(WebCore::SimpleLineLayout::canUseFor):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/SimpleLineLayout.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-25  Antti Koivisto  <antti@apple.com>
+
+        REGRESSION(r157950): It made many tests assert on Windows, EFL, GTK
+        https://bugs.webkit.org/show_bug.cgi?id=123309
+
+        Reviewed by Andreas Kling.
+
+        Disable simple line layout on non-Mac plaforms for now.
+
+        * rendering/SimpleLineLayout.cpp:
+        (WebCore::SimpleLineLayout::canUseFor):
+
 2013-10-24  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/rendering/SimpleLineLayout.cpp

@@ -55 +55 @@
 bool canUseFor(const RenderBlockFlow& flow)
 {
+#if !PLATFORM(MAC)
+    // FIXME: Non-mac platforms are hitting ASSERT(run.charactersLength() >= run.length())
+    // https://bugs.webkit.org/show_bug.cgi?id=123338
+    return false;
+#endif
     if (!flow.firstChild())
         return false;