Changeset 157952 in webkit

Timestamp:

Oct 24, 2013, 1:46:50 PM (13 years ago)

Author:

Antti Koivisto

Message:

Try to fix build without CSS_SHAPES.

• rendering/SimpleLineLayout.cpp:

(WebCore::SimpleLineLayout::canUseFor):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-24  Antti Koivisto  <antti@apple.com>
+
+        Try to fix build without CSS_SHAPES.
+
+        * rendering/SimpleLineLayout.cpp:
+        (WebCore::SimpleLineLayout::canUseFor):
+
 2013-10-24  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/rendering/SimpleLineLayout.cpp

@@ -76 +76 @@
     // These tests only works during layout. Outside layout this function may give false positives.
     if (flow.view().layoutState()) {
+#if ENABLE(CSS_SHAPES)
         if (flow.view().layoutState()->shapeInsideInfo())
             return false;
+#endif
         if (flow.view().layoutState()->m_columnInfo)
             return false;
@@ -117 +119 @@
     if (style.textShadow())
         return false;
+#if ENABLE(CSS_SHAPES)
     if (style.resolvedShapeInside())
         return true;
+#endif
     if (style.textOverflow() || (flow.isAnonymousBlock() && flow.parent()->style()->textOverflow()))
         return false;