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

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

Issue 2916493002: Make SelectionState enum class (Closed)
Patch Set: Created 3 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) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. 3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
4 * All right reserved. 4 * All right reserved.
5 * Copyright (C) 2010 Google Inc. All rights reserved. 5 * Copyright (C) 2010 Google Inc. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 else 296 else
297 box = CreateInlineBoxForLayoutObject(r->line_layout_item_, false, 297 box = CreateInlineBoxForLayoutObject(r->line_layout_item_, false,
298 is_only_run); 298 is_only_run);
299 r->box_ = box; 299 r->box_ = box;
300 300
301 DCHECK(box); 301 DCHECK(box);
302 if (!box) 302 if (!box)
303 continue; 303 continue;
304 304
305 if (!root_has_selected_children && 305 if (!root_has_selected_children &&
306 box->GetLineLayoutItem().GetSelectionState() != SelectionNone) 306 box->GetLineLayoutItem().GetSelectionState() != SelectionState::kNone)
307 root_has_selected_children = true; 307 root_has_selected_children = true;
308 308
309 // If we have no parent box yet, or if the run is not simply a sibling, 309 // If we have no parent box yet, or if the run is not simply a sibling,
310 // then we need to construct inline boxes as necessary to properly enclose 310 // then we need to construct inline boxes as necessary to properly enclose
311 // the run's inline box. Segments can only be siblings at the root level, as 311 // the run's inline box. Segments can only be siblings at the root level, as
312 // they are positioned separately. 312 // they are positioned separately.
313 if (!parent_box || 313 if (!parent_box ||
314 (parent_box->GetLineLayoutItem() != r->line_layout_item_.Parent())) { 314 (parent_box->GetLineLayoutItem() != r->line_layout_item_.Parent())) {
315 // Create new inline boxes all the way back to the appropriate insertion 315 // Create new inline boxes all the way back to the appropriate insertion
316 // point. 316 // point.
(...skipping 2337 matching lines...) Expand 10 before | Expand all | Expand 10 after
2654 2654
2655 bool LayoutBlockFlow::PaintedOutputOfObjectHasNoEffectRegardlessOfSize() const { 2655 bool LayoutBlockFlow::PaintedOutputOfObjectHasNoEffectRegardlessOfSize() const {
2656 // LayoutBlockFlow is in charge of paint invalidation of the first line. 2656 // LayoutBlockFlow is in charge of paint invalidation of the first line.
2657 if (FirstLineBox()) 2657 if (FirstLineBox())
2658 return false; 2658 return false;
2659 2659
2660 return LayoutBlock::PaintedOutputOfObjectHasNoEffectRegardlessOfSize(); 2660 return LayoutBlock::PaintedOutputOfObjectHasNoEffectRegardlessOfSize();
2661 } 2661 }
2662 2662
2663 } // namespace blink 2663 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBlock.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698