Title: [151662] trunk/Source/WebCore
Revision
151662
Author
[email protected]
Date
2013-06-17 17:54:50 -0700 (Mon, 17 Jun 2013)

Log Message

Add some UNUSED_PARAMs to RenderBlock.cpp so that it builds properly if CSS_EXCLUSIONS is disabled.
https://bugs.webkit.org/show_bug.cgi?id=117722.
Rubberstamped by Jon Lee.
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::updateRegionsAndExclusionsAfterChildLayout):
(WebCore::RenderBlock::logicalLeftOffsetForLine):
(WebCore::RenderBlock::logicalRightOffsetForLine):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (151661 => 151662)


--- trunk/Source/WebCore/ChangeLog	2013-06-18 00:41:43 UTC (rev 151661)
+++ trunk/Source/WebCore/ChangeLog	2013-06-18 00:54:50 UTC (rev 151662)
@@ -1,3 +1,15 @@
+2013-06-17  Roger Fong  <[email protected]>
+
+        Add some UNUSED_PARAMs to RenderBlock.cpp so that it builds properly if CSS_EXCLUSIONS is disabled.
+        https://bugs.webkit.org/show_bug.cgi?id=117722.
+
+        Rubberstamped by Jon Lee.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::updateRegionsAndExclusionsAfterChildLayout):
+        (WebCore::RenderBlock::logicalLeftOffsetForLine):
+        (WebCore::RenderBlock::logicalRightOffsetForLine):
+
 2013-06-17  Beth Dakin  <[email protected]>
 
         PageBanners appear over HTML5 video when media element is in full screen mode

Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (151661 => 151662)


--- trunk/Source/WebCore/rendering/RenderBlock.cpp	2013-06-18 00:41:43 UTC (rev 151661)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp	2013-06-18 00:54:50 UTC (rev 151662)
@@ -1530,6 +1530,8 @@
     ShapeInsideInfo* shapeInsideInfo = layoutShapeInsideInfo();
     if (heightChanged && shapeInsideInfo)
         shapeInsideInfo->dirtyShapeSize();
+#else
+    UNUSED_PARAM(heightChanged);
 #endif
     computeRegionRangeForBlock(flowThread);
 }
@@ -4431,6 +4433,9 @@
 
 LayoutUnit RenderBlock::logicalLeftOffsetForLine(LayoutUnit logicalTop, LayoutUnit fixedOffset, bool applyTextIndent, LayoutUnit* heightRemaining, LayoutUnit logicalHeight, ShapeOutsideFloatOffsetMode offsetMode) const
 {
+#if !ENABLE(CSS_EXCLUSIONS)
+    UNUSED_PARAM(offsetMode);
+#endif
     LayoutUnit left = fixedOffset;
     if (m_floatingObjects && m_floatingObjects->hasLeftObjects()) {
         if (heightRemaining)
@@ -4488,6 +4493,9 @@
 
 LayoutUnit RenderBlock::logicalRightOffsetForLine(LayoutUnit logicalTop, LayoutUnit fixedOffset, bool applyTextIndent, LayoutUnit* heightRemaining, LayoutUnit logicalHeight, ShapeOutsideFloatOffsetMode offsetMode) const
 {
+#if !ENABLE(CSS_EXCLUSIONS)
+    UNUSED_PARAM(offsetMode);
+#endif
     LayoutUnit right = fixedOffset;
     if (m_floatingObjects && m_floatingObjects->hasRightObjects()) {
         if (heightRemaining)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to