| Index: sky/engine/core/rendering/InlineFlowBox.cpp
|
| diff --git a/sky/engine/core/rendering/InlineFlowBox.cpp b/sky/engine/core/rendering/InlineFlowBox.cpp
|
| index d3bf1dbbafd8c239b7131884f9091df1b6885c0e..3f997b9f95d8fd79c9d7f98f6b3d54f001631c37 100644
|
| --- a/sky/engine/core/rendering/InlineFlowBox.cpp
|
| +++ b/sky/engine/core/rendering/InlineFlowBox.cpp
|
| @@ -1203,36 +1203,18 @@ void InlineFlowBox::paintMask(PaintInfo& paintInfo, const LayoutPoint& paintOffs
|
| const NinePieceImage& maskNinePieceImage = renderer().style()->maskBoxImage();
|
| StyleImage* maskBoxImage = renderer().style()->maskBoxImage().image();
|
|
|
| - // Figure out if we need to push a transparency layer to render our mask.
|
| - bool pushTransparencyLayer = false;
|
| - bool flattenCompositingLayers = renderer().view()->frameView() && renderer().view()->frameView()->paintBehavior() & PaintBehaviorFlattenCompositingLayers;
|
| - CompositeOperator compositeOp = CompositeSourceOver;
|
| - if (flattenCompositingLayers) {
|
| - if ((maskBoxImage && renderer().style()->maskLayers().hasImage()) || renderer().style()->maskLayers().next())
|
| - pushTransparencyLayer = true;
|
| -
|
| - compositeOp = CompositeDestinationIn;
|
| - if (pushTransparencyLayer) {
|
| - paintInfo.context->setCompositeOperation(CompositeDestinationIn);
|
| - paintInfo.context->beginTransparencyLayer(1.0f);
|
| - compositeOp = CompositeSourceOver;
|
| - }
|
| - }
|
| -
|
| LayoutRect paintRect = LayoutRect(adjustedPaintOffset, frameRect.size());
|
| - paintFillLayers(paintInfo, Color::transparent, renderer().style()->maskLayers(), paintRect, compositeOp);
|
| + paintFillLayers(paintInfo, Color::transparent, renderer().style()->maskLayers(), paintRect, CompositeSourceOver);
|
|
|
| bool hasBoxImage = maskBoxImage && maskBoxImage->canRender(renderer());
|
| if (!hasBoxImage || !maskBoxImage->isLoaded()) {
|
| - if (pushTransparencyLayer)
|
| - paintInfo.context->endLayer();
|
| return; // Don't paint anything while we wait for the image to load.
|
| }
|
|
|
| // The simple case is where we are the only box for this object. In those
|
| // cases only a single call to draw is required.
|
| if (!prevLineBox() && !nextLineBox()) {
|
| - boxModelObject()->paintNinePieceImage(paintInfo.context, LayoutRect(adjustedPaintOffset, frameRect.size()), renderer().style(), maskNinePieceImage, compositeOp);
|
| + boxModelObject()->paintNinePieceImage(paintInfo.context, LayoutRect(adjustedPaintOffset, frameRect.size()), renderer().style(), maskNinePieceImage, CompositeSourceOver);
|
| } else {
|
| // We have a mask image that spans multiple lines.
|
| // We need to adjust _tx and _ty by the width of all previous lines.
|
| @@ -1250,11 +1232,8 @@ void InlineFlowBox::paintMask(PaintInfo& paintInfo, const LayoutPoint& paintOffs
|
| LayoutRect clipRect = clipRectForNinePieceImageStrip(this, maskNinePieceImage, paintRect);
|
| GraphicsContextStateSaver stateSaver(*paintInfo.context);
|
| paintInfo.context->clip(clipRect);
|
| - boxModelObject()->paintNinePieceImage(paintInfo.context, LayoutRect(stripX, stripY, stripWidth, stripHeight), renderer().style(), maskNinePieceImage, compositeOp);
|
| + boxModelObject()->paintNinePieceImage(paintInfo.context, LayoutRect(stripX, stripY, stripWidth, stripHeight), renderer().style(), maskNinePieceImage, CompositeSourceOver);
|
| }
|
| -
|
| - if (pushTransparencyLayer)
|
| - paintInfo.context->endLayer();
|
| }
|
|
|
| InlineBox* InlineFlowBox::firstLeafChild() const
|
|
|