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

Side by Side Diff: Source/core/layout/shapes/ShapeOutsideInfo.h

Issue 1278983003: Adding allocator annotations to blink classes and structs. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed patch conflict Created 5 years, 4 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/layout/shapes/Shape.h ('k') | Source/core/page/Page.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) 2012 Adobe Systems Incorporated. All rights reserved. 2 * Copyright (C) 2012 Adobe Systems Incorporated. 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above 8 * 1. Redistributions of source code must retain the above
9 * copyright notice, this list of conditions and the following 9 * copyright notice, this list of conditions and the following
10 * disclaimer. 10 * disclaimer.
(...skipping 27 matching lines...) Expand all
38 #include "platform/geometry/LayoutSize.h" 38 #include "platform/geometry/LayoutSize.h"
39 #include "wtf/OwnPtr.h" 39 #include "wtf/OwnPtr.h"
40 40
41 namespace blink { 41 namespace blink {
42 42
43 class LayoutBlockFlow; 43 class LayoutBlockFlow;
44 class LayoutBox; 44 class LayoutBox;
45 class FloatingObject; 45 class FloatingObject;
46 46
47 class ShapeOutsideDeltas final { 47 class ShapeOutsideDeltas final {
48 DISALLOW_ALLOCATION();
48 public: 49 public:
49 ShapeOutsideDeltas() 50 ShapeOutsideDeltas()
50 : m_lineOverlapsShape(false) 51 : m_lineOverlapsShape(false)
51 , m_isValid(false) 52 , m_isValid(false)
52 { 53 {
53 } 54 }
54 55
55 ShapeOutsideDeltas(LayoutUnit leftMarginBoxDelta, LayoutUnit rightMarginBoxD elta, bool lineOverlapsShape, LayoutUnit borderBoxLineTop, LayoutUnit lineHeight ) 56 ShapeOutsideDeltas(LayoutUnit leftMarginBoxDelta, LayoutUnit rightMarginBoxD elta, bool lineOverlapsShape, LayoutUnit borderBoxLineTop, LayoutUnit lineHeight )
56 : m_leftMarginBoxDelta(leftMarginBoxDelta) 57 : m_leftMarginBoxDelta(leftMarginBoxDelta)
57 , m_rightMarginBoxDelta(rightMarginBoxDelta) 58 , m_rightMarginBoxDelta(rightMarginBoxDelta)
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 141
141 const LayoutBox& m_layoutBox; 142 const LayoutBox& m_layoutBox;
142 mutable OwnPtr<Shape> m_shape; 143 mutable OwnPtr<Shape> m_shape;
143 LayoutSize m_referenceBoxLogicalSize; 144 LayoutSize m_referenceBoxLogicalSize;
144 ShapeOutsideDeltas m_shapeOutsideDeltas; 145 ShapeOutsideDeltas m_shapeOutsideDeltas;
145 mutable bool m_isComputingShape; 146 mutable bool m_isComputingShape;
146 }; 147 };
147 148
148 } 149 }
149 #endif 150 #endif
OLDNEW
« no previous file with comments | « Source/core/layout/shapes/Shape.h ('k') | Source/core/page/Page.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698