Title: [163537] trunk/Source/WebCore
- Revision
- 163537
- Author
- [email protected]
- Date
- 2014-02-06 09:29:46 -0800 (Thu, 06 Feb 2014)
Log Message
Re-enable simple line layout on non-Mac platforms
https://bugs.webkit.org/show_bug.cgi?id=123338
Reviewed by Anders Carlsson.
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::canUseFor):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (163536 => 163537)
--- trunk/Source/WebCore/ChangeLog 2014-02-06 17:03:16 UTC (rev 163536)
+++ trunk/Source/WebCore/ChangeLog 2014-02-06 17:29:46 UTC (rev 163537)
@@ -1,3 +1,13 @@
+2014-02-06 Csaba Osztrogonác <[email protected]>
+
+ Re-enable simple line layout on non-Mac platforms
+ https://bugs.webkit.org/show_bug.cgi?id=123338
+
+ Reviewed by Anders Carlsson.
+
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::canUseFor):
+
2014-02-06 Koop Mast <[email protected]>
Use system default compiler instead of gcc, as final fall through.
Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (163536 => 163537)
--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2014-02-06 17:03:16 UTC (rev 163536)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2014-02-06 17:29:46 UTC (rev 163537)
@@ -89,11 +89,6 @@
bool canUseFor(const RenderBlockFlow& flow)
{
-#if !PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(EFL)
- // FIXME: Non-mac platforms are hitting ASSERT(run.charactersLength() >= run.length())
- // https://bugs.webkit.org/show_bug.cgi?id=123338
- return false;
-#else
if (!flow.frame().settings().simpleLineLayoutEnabled())
return false;
if (!flow.firstChild())
@@ -200,7 +195,6 @@
return false;
return true;
-#endif
}
struct Style {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
