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

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

Issue 815933006: Change all uses of the RoundedRect class to use FloatRoundedRect instead. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 12 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderBlock.cpp ('k') | Source/core/rendering/RenderThemeChromiumMac.mm » ('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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 #include "core/rendering/RenderInline.h" 51 #include "core/rendering/RenderInline.h"
52 #include "core/rendering/RenderLayer.h" 52 #include "core/rendering/RenderLayer.h"
53 #include "core/rendering/RenderListBox.h" 53 #include "core/rendering/RenderListBox.h"
54 #include "core/rendering/RenderListMarker.h" 54 #include "core/rendering/RenderListMarker.h"
55 #include "core/rendering/RenderMultiColumnSpannerPlaceholder.h" 55 #include "core/rendering/RenderMultiColumnSpannerPlaceholder.h"
56 #include "core/rendering/RenderTableCell.h" 56 #include "core/rendering/RenderTableCell.h"
57 #include "core/rendering/RenderView.h" 57 #include "core/rendering/RenderView.h"
58 #include "core/rendering/compositing/RenderLayerCompositor.h" 58 #include "core/rendering/compositing/RenderLayerCompositor.h"
59 #include "platform/LengthFunctions.h" 59 #include "platform/LengthFunctions.h"
60 #include "platform/geometry/FloatQuad.h" 60 #include "platform/geometry/FloatQuad.h"
61 #include "platform/geometry/FloatRoundedRect.h"
61 #include "platform/geometry/TransformState.h" 62 #include "platform/geometry/TransformState.h"
62 #include <algorithm> 63 #include <algorithm>
63 #include <math.h> 64 #include <math.h>
64 65
65 namespace blink { 66 namespace blink {
66 67
67 using namespace HTMLNames; 68 using namespace HTMLNames;
68 69
69 // Used by flexible boxes when flexing this element and by table cells. 70 // Used by flexible boxes when flexing this element and by table cells.
70 typedef WTF::HashMap<const RenderBox*, LayoutUnit> OverrideSizeMap; 71 typedef WTF::HashMap<const RenderBox*, LayoutUnit> OverrideSizeMap;
(...skipping 3808 matching lines...) Expand 10 before | Expand all | Expand 10 after
3879 // See another hasNonCompositedScrollbars() callsite above. 3880 // See another hasNonCompositedScrollbars() callsite above.
3880 if (hasNonCompositedScrollbars()) 3881 if (hasNonCompositedScrollbars())
3881 return PaintInvalidationBorderBoxChange; 3882 return PaintInvalidationBorderBoxChange;
3882 3883
3883 if (style()->hasVisualOverflowingEffect() || style()->hasAppearance() || sty le()->hasFilter() || style()->resize() != RESIZE_NONE) 3884 if (style()->hasVisualOverflowingEffect() || style()->hasAppearance() || sty le()->hasFilter() || style()->resize() != RESIZE_NONE)
3884 return PaintInvalidationBorderBoxChange; 3885 return PaintInvalidationBorderBoxChange;
3885 3886
3886 if (style()->hasBorderRadius()) { 3887 if (style()->hasBorderRadius()) {
3887 // If a border-radius exists and width/height is smaller than radius wid th/height, 3888 // If a border-radius exists and width/height is smaller than radius wid th/height,
3888 // we need to fully invalidate to cover the changed radius. 3889 // we need to fully invalidate to cover the changed radius.
3889 RoundedRect oldRoundedRect = style()->getRoundedBorderFor(LayoutRect(Lay outPoint(0, 0), oldBorderBoxSize)); 3890 FloatRoundedRect oldRoundedRect = style()->getRoundedBorderFor(LayoutRec t(LayoutPoint(0, 0), oldBorderBoxSize));
3890 RoundedRect newRoundedRect = style()->getRoundedBorderFor(LayoutRect(Lay outPoint(0, 0), newBorderBoxSize)); 3891 FloatRoundedRect newRoundedRect = style()->getRoundedBorderFor(LayoutRec t(LayoutPoint(0, 0), newBorderBoxSize));
3891 if (oldRoundedRect.radii() != newRoundedRect.radii()) 3892 if (oldRoundedRect.radii() != newRoundedRect.radii())
3892 return PaintInvalidationBorderBoxChange; 3893 return PaintInvalidationBorderBoxChange;
3893 } 3894 }
3894 3895
3895 if (oldBorderBoxSize.width() != newBorderBoxSize.width() && mustInvalidateBa ckgroundOrBorderPaintOnWidthChange()) 3896 if (oldBorderBoxSize.width() != newBorderBoxSize.width() && mustInvalidateBa ckgroundOrBorderPaintOnWidthChange())
3896 return PaintInvalidationBorderBoxChange; 3897 return PaintInvalidationBorderBoxChange;
3897 if (oldBorderBoxSize.height() != newBorderBoxSize.height() && mustInvalidate BackgroundOrBorderPaintOnHeightChange()) 3898 if (oldBorderBoxSize.height() != newBorderBoxSize.height() && mustInvalidate BackgroundOrBorderPaintOnHeightChange())
3898 return PaintInvalidationBorderBoxChange; 3899 return PaintInvalidationBorderBoxChange;
3899 3900
3900 return PaintInvalidationIncremental; 3901 return PaintInvalidationIncremental;
(...skipping 618 matching lines...) Expand 10 before | Expand all | Expand 10 after
4519 computedValues.m_margins.m_end = marginEnd(); 4520 computedValues.m_margins.m_end = marginEnd();
4520 4521
4521 setLogicalTop(oldLogicalTop); 4522 setLogicalTop(oldLogicalTop);
4522 setLogicalWidth(oldLogicalWidth); 4523 setLogicalWidth(oldLogicalWidth);
4523 setLogicalLeft(oldLogicalLeft); 4524 setLogicalLeft(oldLogicalLeft);
4524 setMarginLeft(oldMarginLeft); 4525 setMarginLeft(oldMarginLeft);
4525 setMarginRight(oldMarginRight); 4526 setMarginRight(oldMarginRight);
4526 } 4527 }
4527 4528
4528 } // namespace blink 4529 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlock.cpp ('k') | Source/core/rendering/RenderThemeChromiumMac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698