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

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

Issue 2614883007: Change computed style enums to be prefixed with 'k'. (Closed)
Patch Set: Rebase on ToT. Created 3 years, 11 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) 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 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc.
5 * All rights reserved. 5 * 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 1138 matching lines...) Expand 10 before | Expand all | Expand 10 after
1149 } 1149 }
1150 } 1150 }
1151 return LayoutRect(); 1151 return LayoutRect();
1152 } 1152 }
1153 1153
1154 LayoutRect LayoutInline::localVisualRect() const { 1154 LayoutRect LayoutInline::localVisualRect() const {
1155 // If we don't create line boxes, we don't have any invalidations to do. 1155 // If we don't create line boxes, we don't have any invalidations to do.
1156 if (!alwaysCreateLineBoxes()) 1156 if (!alwaysCreateLineBoxes())
1157 return LayoutRect(); 1157 return LayoutRect();
1158 1158
1159 if (style()->visibility() != EVisibility::Visible) 1159 if (style()->visibility() != EVisibility::kVisible)
1160 return LayoutRect(); 1160 return LayoutRect();
1161 1161
1162 return visualOverflowRect(); 1162 return visualOverflowRect();
1163 } 1163 }
1164 1164
1165 LayoutRect LayoutInline::visualOverflowRect() const { 1165 LayoutRect LayoutInline::visualOverflowRect() const {
1166 LayoutRect overflowRect = linesVisualOverflowBoundingBox(); 1166 LayoutRect overflowRect = linesVisualOverflowBoundingBox();
1167 LayoutUnit outlineOutset(style()->outlineOutsetExtent()); 1167 LayoutUnit outlineOutset(style()->outlineOutsetExtent());
1168 if (outlineOutset) { 1168 if (outlineOutset) {
1169 Vector<LayoutRect> rects; 1169 Vector<LayoutRect> rects;
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
1477 1477
1478 void LayoutInline::computeSelfHitTestRects( 1478 void LayoutInline::computeSelfHitTestRects(
1479 Vector<LayoutRect>& rects, 1479 Vector<LayoutRect>& rects,
1480 const LayoutPoint& layerOffset) const { 1480 const LayoutPoint& layerOffset) const {
1481 AbsoluteLayoutRectsGeneratorContext context(rects, layerOffset); 1481 AbsoluteLayoutRectsGeneratorContext context(rects, layerOffset);
1482 generateLineBoxRects(context); 1482 generateLineBoxRects(context);
1483 } 1483 }
1484 1484
1485 void LayoutInline::addAnnotatedRegions(Vector<AnnotatedRegionValue>& regions) { 1485 void LayoutInline::addAnnotatedRegions(Vector<AnnotatedRegionValue>& regions) {
1486 // Convert the style regions to absolute coordinates. 1486 // Convert the style regions to absolute coordinates.
1487 if (style()->visibility() != EVisibility::Visible) 1487 if (style()->visibility() != EVisibility::kVisible)
1488 return; 1488 return;
1489 1489
1490 if (style()->getDraggableRegionMode() == DraggableRegionNone) 1490 if (style()->getDraggableRegionMode() == DraggableRegionNone)
1491 return; 1491 return;
1492 1492
1493 AnnotatedRegionValue region; 1493 AnnotatedRegionValue region;
1494 region.draggable = style()->getDraggableRegionMode() == DraggableRegionDrag; 1494 region.draggable = style()->getDraggableRegionMode() == DraggableRegionDrag;
1495 region.bounds = LayoutRect(linesBoundingBox()); 1495 region.bounds = LayoutRect(linesBoundingBox());
1496 1496
1497 LayoutObject* container = containingBlock(); 1497 LayoutObject* container = containingBlock();
(...skipping 16 matching lines...) Expand all
1514 paintInvalidator.invalidateDisplayItemClient(*box, invalidationReason); 1514 paintInvalidator.invalidateDisplayItemClient(*box, invalidationReason);
1515 } 1515 }
1516 1516
1517 // TODO(lunalu): Not to just dump 0, 0 as the x and y here 1517 // TODO(lunalu): Not to just dump 0, 0 as the x and y here
1518 LayoutRect LayoutInline::debugRect() const { 1518 LayoutRect LayoutInline::debugRect() const {
1519 IntRect linesBox = enclosingIntRect(linesBoundingBox()); 1519 IntRect linesBox = enclosingIntRect(linesBoundingBox());
1520 return LayoutRect(IntRect(0, 0, linesBox.width(), linesBox.height())); 1520 return LayoutRect(IntRect(0, 0, linesBox.width(), linesBox.height()));
1521 } 1521 }
1522 1522
1523 } // namespace blink 1523 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutListItem.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698