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

Side by Side Diff: Source/core/layout/LayoutBlock.cpp

Issue 1148833002: Move m_pageLogicalOffset from LayoutBlock to LayoutBoxRareData. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: sizeof(LayoutBlock) has shrunk. Created 5 years, 7 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
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) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 using namespace WTF; 74 using namespace WTF;
75 using namespace Unicode; 75 using namespace Unicode;
76 76
77 namespace blink { 77 namespace blink {
78 78
79 using namespace HTMLNames; 79 using namespace HTMLNames;
80 80
81 struct SameSizeAsLayoutBlock : public LayoutBox { 81 struct SameSizeAsLayoutBlock : public LayoutBox {
82 LayoutObjectChildList children; 82 LayoutObjectChildList children;
83 LineBoxList lineBoxes; 83 LineBoxList lineBoxes;
84 int pageLogicalOffset;
85 uint32_t bitfields; 84 uint32_t bitfields;
86 }; 85 };
87 86
88 static_assert(sizeof(LayoutBlock) == sizeof(SameSizeAsLayoutBlock), "LayoutBlock should stay small"); 87 static_assert(sizeof(LayoutBlock) == sizeof(SameSizeAsLayoutBlock), "LayoutBlock should stay small");
89 88
90 typedef WTF::HashMap<const LayoutBox*, OwnPtr<ColumnInfo>> ColumnInfoMap; 89 typedef WTF::HashMap<const LayoutBox*, OwnPtr<ColumnInfo>> ColumnInfoMap;
91 static ColumnInfoMap* gColumnInfoMap = 0; 90 static ColumnInfoMap* gColumnInfoMap = 0;
92 91
93 static TrackedDescendantsMap* gPositionedDescendantsMap = 0; 92 static TrackedDescendantsMap* gPositionedDescendantsMap = 0;
94 static TrackedDescendantsMap* gPercentHeightDescendantsMap = 0; 93 static TrackedDescendantsMap* gPercentHeightDescendantsMap = 0;
(...skipping 3826 matching lines...) Expand 10 before | Expand all | Expand 10 after
3921 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const 3920 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const
3922 { 3921 {
3923 showLayoutObject(); 3922 showLayoutObject();
3924 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 3923 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
3925 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 3924 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
3926 } 3925 }
3927 3926
3928 #endif 3927 #endif
3929 3928
3930 } // namespace blink 3929 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698