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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutBox.cpp

Issue 2689213013: Move previous border box size out of global map into LayoutBox::m_previousSize (Closed)
Patch Set: - Created 3 years, 10 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
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. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc.
7 * All rights reserved. 7 * All rights reserved.
8 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 8 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 static OverrideSizeMap* gExtraInlineOffsetMap = nullptr; 78 static OverrideSizeMap* gExtraInlineOffsetMap = nullptr;
79 static OverrideSizeMap* gExtraBlockOffsetMap = nullptr; 79 static OverrideSizeMap* gExtraBlockOffsetMap = nullptr;
80 80
81 // Size of border belt for autoscroll. When mouse pointer in border belt, 81 // Size of border belt for autoscroll. When mouse pointer in border belt,
82 // autoscroll is started. 82 // autoscroll is started.
83 static const int autoscrollBeltSize = 20; 83 static const int autoscrollBeltSize = 20;
84 static const unsigned backgroundObscurationTestMaxDepth = 4; 84 static const unsigned backgroundObscurationTestMaxDepth = 4;
85 85
86 struct SameSizeAsLayoutBox : public LayoutBoxModelObject { 86 struct SameSizeAsLayoutBox : public LayoutBoxModelObject {
87 LayoutRect frameRect; 87 LayoutRect frameRect;
88 LayoutSize previousSize;
88 LayoutUnit intrinsicContentLogicalHeight; 89 LayoutUnit intrinsicContentLogicalHeight;
89 LayoutRectOutsets marginBoxOutsets; 90 LayoutRectOutsets marginBoxOutsets;
90 LayoutUnit preferredLogicalWidth[2]; 91 LayoutUnit preferredLogicalWidth[2];
91 void* pointers[3]; 92 void* pointers[3];
92 }; 93 };
93 94
94 static_assert(sizeof(LayoutBox) == sizeof(SameSizeAsLayoutBox), 95 static_assert(sizeof(LayoutBox) == sizeof(SameSizeAsLayoutBox),
95 "LayoutBox should stay small"); 96 "LayoutBox should stay small");
96 97
97 LayoutBox::LayoutBox(ContainerNode* node) 98 LayoutBox::LayoutBox(ContainerNode* node)
(...skipping 5616 matching lines...) Expand 10 before | Expand all | Expand 10 after
5714 block->adjustChildDebugRect(rect); 5715 block->adjustChildDebugRect(rect);
5715 5716
5716 return rect; 5717 return rect;
5717 } 5718 }
5718 5719
5719 bool LayoutBox::shouldClipOverflow() const { 5720 bool LayoutBox::shouldClipOverflow() const {
5720 return hasOverflowClip() || styleRef().containsPaint() || hasControlClip(); 5721 return hasOverflowClip() || styleRef().containsPaint() || hasControlClip();
5721 } 5722 }
5722 5723
5723 } // namespace blink 5724 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBox.h ('k') | third_party/WebKit/Source/core/paint/BoxPaintInvalidator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698