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

Side by Side Diff: third_party/WebKit/Source/core/layout/line/InlineFlowBox.h

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 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) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 * Library General Public License for more details. 12 * Library General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU Library General Public License 14 * You should have received a copy of the GNU Library General Public License
15 * along with this library; see the file COPYING.LIB. If not, write to 15 * along with this library; see the file COPYING.LIB. If not, write to
16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
17 * Boston, MA 02110-1301, USA. 17 * Boston, MA 02110-1301, USA.
18 * 18 *
19 */ 19 */
20 20
21 #ifndef InlineFlowBox_h 21 #ifndef InlineFlowBox_h
22 #define InlineFlowBox_h 22 #define InlineFlowBox_h
23 23
24 #include "core/layout/OverflowModel.h" 24 #include "core/layout/OverflowModel.h"
25 #include "core/layout/api/SelectionState.h" 25 #include "core/layout/api/SelectionState.h"
26 #include "core/layout/line/InlineBox.h" 26 #include "core/layout/line/InlineBox.h"
27 #include "core/style/ShadowData.h" 27 #include "core/style/ShadowData.h"
28 #include <memory>
28 29
29 namespace blink { 30 namespace blink {
30 31
31 class HitTestRequest; 32 class HitTestRequest;
32 class HitTestResult; 33 class HitTestResult;
33 class InlineTextBox; 34 class InlineTextBox;
34 class LineBoxList; 35 class LineBoxList;
35 class SimpleFontData; 36 class SimpleFontData;
36 class VerticalPositionCache; 37 class VerticalPositionCache;
37 38
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 void addOutlineVisualOverflow(LayoutRect& logicalVisualOverflow); 304 void addOutlineVisualOverflow(LayoutRect& logicalVisualOverflow);
304 void addTextBoxVisualOverflow(InlineTextBox*, GlyphOverflowAndFallbackFontsM ap&, LayoutRect& logicalVisualOverflow); 305 void addTextBoxVisualOverflow(InlineTextBox*, GlyphOverflowAndFallbackFontsM ap&, LayoutRect& logicalVisualOverflow);
305 void addReplacedChildOverflow(const InlineBox*, LayoutRect& logicalLayoutOve rflow, LayoutRect& logicalVisualOverflow); 306 void addReplacedChildOverflow(const InlineBox*, LayoutRect& logicalLayoutOve rflow, LayoutRect& logicalVisualOverflow);
306 307
307 void setLayoutOverflow(const LayoutRect&, const LayoutRect&); 308 void setLayoutOverflow(const LayoutRect&, const LayoutRect&);
308 void setVisualOverflow(const LayoutRect&, const LayoutRect&); 309 void setVisualOverflow(const LayoutRect&, const LayoutRect&);
309 310
310 void setOverflowFromLogicalRects(const LayoutRect& logicalLayoutOverflow, co nst LayoutRect& logicalVisualOverflow, LayoutUnit lineTop, LayoutUnit lineBottom ); 311 void setOverflowFromLogicalRects(const LayoutRect& logicalLayoutOverflow, co nst LayoutRect& logicalVisualOverflow, LayoutUnit lineTop, LayoutUnit lineBottom );
311 312
312 protected: 313 protected:
313 OwnPtr<SimpleOverflowModel> m_overflow; 314 std::unique_ptr<SimpleOverflowModel> m_overflow;
314 315
315 bool isInlineFlowBox() const final { return true; } 316 bool isInlineFlowBox() const final { return true; }
316 317
317 InlineBox* m_firstChild; 318 InlineBox* m_firstChild;
318 InlineBox* m_lastChild; 319 InlineBox* m_lastChild;
319 320
320 InlineFlowBox* m_prevLineBox; // The previous box that also uses our LayoutO bject 321 InlineFlowBox* m_prevLineBox; // The previous box that also uses our LayoutO bject
321 InlineFlowBox* m_nextLineBox; // The next box that also uses our LayoutObjec t 322 InlineFlowBox* m_nextLineBox; // The next box that also uses our LayoutObjec t
322 323
323 // Maximum logicalTop among all children of an InlineFlowBox. Used to 324 // Maximum logicalTop among all children of an InlineFlowBox. Used to
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 inline void InlineFlowBox::setHasBadChildList() 367 inline void InlineFlowBox::setHasBadChildList()
367 { 368 {
368 #if ENABLE(ASSERT) 369 #if ENABLE(ASSERT)
369 m_hasBadChildList = true; 370 m_hasBadChildList = true;
370 #endif 371 #endif
371 } 372 }
372 373
373 } // namespace blink 374 } // namespace blink
374 375
375 #endif // InlineFlowBox_h 376 #endif // InlineFlowBox_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698