Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(895)

Side by Side Diff: Source/core/rendering/RenderBox.cpp

Issue 16688004: Large canvas does not honor containing div's border radius (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Replaced explicit baselines with NeedsRebaseline Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/core/rendering/RenderBox.h ('k') | Source/core/rendering/RenderLayer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 1299 matching lines...) Expand 10 before | Expand all | Expand 10 after
1310 1310
1311 void RenderBox::paintMask(PaintInfo& paintInfo, const LayoutPoint& paintOffset) 1311 void RenderBox::paintMask(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
1312 { 1312 {
1313 if (!paintInfo.shouldPaintWithinRoot(this) || style()->visibility() != VISIB LE || paintInfo.phase != PaintPhaseMask || paintInfo.context->paintingDisabled() ) 1313 if (!paintInfo.shouldPaintWithinRoot(this) || style()->visibility() != VISIB LE || paintInfo.phase != PaintPhaseMask || paintInfo.context->paintingDisabled() )
1314 return; 1314 return;
1315 1315
1316 LayoutRect paintRect = LayoutRect(paintOffset, size()); 1316 LayoutRect paintRect = LayoutRect(paintOffset, size());
1317 paintMaskImages(paintInfo, paintRect); 1317 paintMaskImages(paintInfo, paintRect);
1318 } 1318 }
1319 1319
1320 void RenderBox::paintClippingMask(PaintInfo& paintInfo, const LayoutPoint& paint Offset)
1321 {
1322 if (!paintInfo.shouldPaintWithinRoot(this) || style()->visibility() != VISIB LE || paintInfo.phase != PaintPhaseClippingMask || paintInfo.context->paintingDi sabled())
1323 return;
1324
1325 if (!layer() || !layer()->isComposited())
1326 return;
1327
1328 LayoutRect paintRect = LayoutRect(paintOffset, size());
1329 paintInfo.context->fillRect(pixelSnappedIntRect(paintRect), Color::black);
1330 }
1331
1320 void RenderBox::paintMaskImages(const PaintInfo& paintInfo, const LayoutRect& pa intRect) 1332 void RenderBox::paintMaskImages(const PaintInfo& paintInfo, const LayoutRect& pa intRect)
1321 { 1333 {
1322 // Figure out if we need to push a transparency layer to render our mask. 1334 // Figure out if we need to push a transparency layer to render our mask.
1323 bool pushTransparencyLayer = false; 1335 bool pushTransparencyLayer = false;
1324 bool compositedMask = hasLayer() && layer()->hasCompositedMask(); 1336 bool compositedMask = hasLayer() && layer()->hasCompositedMask();
1325 bool flattenCompositingLayers = view()->frameView() && view()->frameView()-> paintBehavior() & PaintBehaviorFlattenCompositingLayers; 1337 bool flattenCompositingLayers = view()->frameView() && view()->frameView()-> paintBehavior() & PaintBehaviorFlattenCompositingLayers;
1326 CompositeOperator compositeOp = CompositeSourceOver; 1338 CompositeOperator compositeOp = CompositeSourceOver;
1327 1339
1328 bool allMaskImagesLoaded = true; 1340 bool allMaskImagesLoaded = true;
1329 1341
(...skipping 3392 matching lines...) Expand 10 before | Expand all | Expand 10 after
4722 return 0; 4734 return 0;
4723 4735
4724 if (!layoutState && !flowThreadContainingBlock()) 4736 if (!layoutState && !flowThreadContainingBlock())
4725 return 0; 4737 return 0;
4726 4738
4727 RenderBlock* containerBlock = containingBlock(); 4739 RenderBlock* containerBlock = containingBlock();
4728 return containerBlock->offsetFromLogicalTopOfFirstPage() + logicalTop(); 4740 return containerBlock->offsetFromLogicalTopOfFirstPage() + logicalTop();
4729 } 4741 }
4730 4742
4731 } // namespace WebCore 4743 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBox.h ('k') | Source/core/rendering/RenderLayer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698