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

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

Issue 1045723009: Move core/layout/style to core/style (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase. Created 5 years, 8 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/layout/LayoutCounter.cpp ('k') | Source/core/layout/LayoutFullScreen.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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 16 matching lines...) Expand all
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "core/layout/LayoutFlexibleBox.h" 32 #include "core/layout/LayoutFlexibleBox.h"
33 33
34 #include "core/frame/UseCounter.h" 34 #include "core/frame/UseCounter.h"
35 #include "core/layout/LayoutView.h" 35 #include "core/layout/LayoutView.h"
36 #include "core/layout/TextAutosizer.h" 36 #include "core/layout/TextAutosizer.h"
37 #include "core/layout/style/ComputedStyle.h" 37 #include "core/style/ComputedStyle.h"
38 #include "core/paint/BlockPainter.h" 38 #include "core/paint/BlockPainter.h"
39 #include "core/paint/DeprecatedPaintLayer.h" 39 #include "core/paint/DeprecatedPaintLayer.h"
40 #include "platform/LengthFunctions.h" 40 #include "platform/LengthFunctions.h"
41 #include "wtf/MathExtras.h" 41 #include "wtf/MathExtras.h"
42 #include <limits> 42 #include <limits>
43 43
44 namespace blink { 44 namespace blink {
45 45
46 struct LayoutFlexibleBox::LineContext { 46 struct LayoutFlexibleBox::LineContext {
47 LineContext(LayoutUnit crossAxisOffset, LayoutUnit crossAxisExtent, size_t n umberOfChildren, LayoutUnit maxAscent) 47 LineContext(LayoutUnit crossAxisOffset, LayoutUnit crossAxisExtent, size_t n umberOfChildren, LayoutUnit maxAscent)
(...skipping 1347 matching lines...) Expand 10 before | Expand all | Expand 10 after
1395 ASSERT(child); 1395 ASSERT(child);
1396 LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisE xtent; 1396 LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisE xtent;
1397 LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset - crossAxisStartEdge; 1397 LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset - crossAxisStartEdge;
1398 LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxi sExtent; 1398 LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxi sExtent;
1399 adjustAlignmentForChild(*child, newOffset - originalOffset); 1399 adjustAlignmentForChild(*child, newOffset - originalOffset);
1400 } 1400 }
1401 } 1401 }
1402 } 1402 }
1403 1403
1404 } 1404 }
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutCounter.cpp ('k') | Source/core/layout/LayoutFullScreen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698