Upstream version 9.38.198.0

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

diff --git a/src/third_party/WebKit/Source/core/rendering/svg/SVGInlineFlowBox.cpp b/src/third_party/WebKit/Source/core/rendering/svg/SVGInlineFlowBox.cpp
index d4a861c..c0328da 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/svg/SVGInlineFlowBox.cpp
+++ b/src/third_party/WebKit/Source/core/rendering/svg/SVGInlineFlowBox.cpp
@@ -27,14 +27,11 @@
 #include "core/rendering/svg/SVGInlineTextBox.h"
 #include "core/rendering/svg/SVGRenderingContext.h"
 
-using namespace std;
-
-namespace WebCore {
+namespace blink {
 
 void SVGInlineFlowBox::paintSelectionBackground(PaintInfo& paintInfo)
 {
     ASSERT(paintInfo.phase == PaintPhaseForeground || paintInfo.phase == PaintPhaseSelection);
-    ASSERT(!paintInfo.context->paintingDisabled());
 
     PaintInfo childPaintInfo(paintInfo);
     for (InlineBox* child = firstChild(); child; child = child->nextOnLine()) {
@@ -48,7 +45,6 @@ void SVGInlineFlowBox::paintSelectionBackground(PaintInfo& paintInfo)
 void SVGInlineFlowBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit, LayoutUnit)
 {
     ASSERT(paintInfo.phase == PaintPhaseForeground || paintInfo.phase == PaintPhaseSelection);
-    ASSERT(!paintInfo.context->paintingDisabled());
 
     SVGRenderingContext renderingContext(&renderer(), paintInfo, SVGRenderingContext::SaveGraphicsContext);
     if (renderingContext.isRenderingPrepared()) {
@@ -68,4 +64,4 @@ FloatRect SVGInlineFlowBox::calculateBoundaries() const
     return childRect;
 }
 
-} // namespace WebCore
+} // namespace blink