Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / RenderFieldset.cpp

diff --git a/src/third_party/WebKit/Source/core/rendering/RenderFieldset.cpp b/src/third_party/WebKit/Source/core/rendering/RenderFieldset.cpp
index 23a3cf9..2537a9d 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/RenderFieldset.cpp
+++ b/src/third_party/WebKit/Source/core/rendering/RenderFieldset.cpp
@@ -26,8 +26,8 @@
 
 #include "CSSPropertyNames.h"
 #include "HTMLNames.h"
-#include "core/platform/graphics/GraphicsContextStateSaver.h"
 #include "core/rendering/PaintInfo.h"
+#include "platform/graphics/GraphicsContextStateSaver.h"
 
 using std::min;
 using std::max;
@@ -43,7 +43,7 @@ RenderFieldset::RenderFieldset(Element* element)
 
 void RenderFieldset::computePreferredLogicalWidths()
 {
-    RenderBlock::computePreferredLogicalWidths();
+    RenderBlockFlow::computePreferredLogicalWidths();
     if (RenderBox* legend = findLegend()) {
         int legendMinWidth = legend->minPreferredLogicalWidth();
 
@@ -143,7 +143,7 @@ void RenderFieldset::paintBoxDecorations(PaintInfo& paintInfo, const LayoutPoint
     LayoutRect paintRect(paintOffset, size());
     RenderBox* legend = findLegend();
     if (!legend)
-        return RenderBlock::paintBoxDecorations(paintInfo, paintOffset);
+        return RenderBlockFlow::paintBoxDecorations(paintInfo, paintOffset);
 
     // FIXME: We need to work with "rl" and "bt" block flow directions.  In those
     // cases the legend is embedded in the right and bottom borders respectively.
@@ -194,7 +194,7 @@ void RenderFieldset::paintMask(PaintInfo& paintInfo, const LayoutPoint& paintOff
     LayoutRect paintRect = LayoutRect(paintOffset, size());
     RenderBox* legend = findLegend();
     if (!legend)
-        return RenderBlock::paintMask(paintInfo, paintOffset);
+        return RenderBlockFlow::paintMask(paintInfo, paintOffset);
 
     // FIXME: We need to work with "rl" and "bt" block flow directions.  In those
     // cases the legend is embedded in the right and bottom borders respectively.