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

Side by Side Diff: Source/core/layout/LayoutObject.h

Issue 1156143002: *** NOT FOR LANDING *** Text nodes should only inherit inheritable properties. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Some tests need to be rebaselined. Text nodes can no longer have z-index. Created 5 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 1233 matching lines...) Expand 10 before | Expand all | Expand 10 after
1244 StyleDifference adjustStyleDifference(StyleDifference) const; 1244 StyleDifference adjustStyleDifference(StyleDifference) const;
1245 1245
1246 Color selectionColor(int colorProperty) const; 1246 Color selectionColor(int colorProperty) const;
1247 1247
1248 void removeShapeImageClient(ShapeValue*); 1248 void removeShapeImageClient(ShapeValue*);
1249 1249
1250 #if ENABLE(ASSERT) 1250 #if ENABLE(ASSERT)
1251 void checkBlockPositionedObjectsNeedLayout(); 1251 void checkBlockPositionedObjectsNeedLayout();
1252 #endif 1252 #endif
1253 1253
1254 bool isTextOrSVGChild() const { return isText() || (isSVG() && !isSVGRoot()) ; } 1254 bool isSVGChild() const { return isSVG() && !isSVGRoot(); }
1255 1255
1256 static bool isAllowedToModifyLayoutTreeStructure(Document&); 1256 static bool isAllowedToModifyLayoutTreeStructure(Document&);
1257 1257
1258 const LayoutBoxModelObject* invalidatePaintRectangleInternal(const LayoutRec t&) const; 1258 const LayoutBoxModelObject* invalidatePaintRectangleInternal(const LayoutRec t&) const;
1259 1259
1260 RefPtr<ComputedStyle> m_style; 1260 RefPtr<ComputedStyle> m_style;
1261 1261
1262 // Oilpan: raw pointer back to the owning Node is considered safe. 1262 // Oilpan: raw pointer back to the owning Node is considered safe.
1263 Node* m_node; 1263 Node* m_node;
1264 1264
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
1467 // Allow equality comparisons of LayoutObjects by reference or pointer, intercha ngeably. 1467 // Allow equality comparisons of LayoutObjects by reference or pointer, intercha ngeably.
1468 DEFINE_COMPARISON_OPERATORS_WITH_REFERENCES(LayoutObject) 1468 DEFINE_COMPARISON_OPERATORS_WITH_REFERENCES(LayoutObject)
1469 1469
1470 inline bool LayoutObject::documentBeingDestroyed() const 1470 inline bool LayoutObject::documentBeingDestroyed() const
1471 { 1471 {
1472 return document().lifecycle().state() >= DocumentLifecycle::Stopping; 1472 return document().lifecycle().state() >= DocumentLifecycle::Stopping;
1473 } 1473 }
1474 1474
1475 inline bool LayoutObject::isBeforeContent() const 1475 inline bool LayoutObject::isBeforeContent() const
1476 { 1476 {
1477 if (style()->styleType() != BEFORE) 1477 return style()->styleType() == BEFORE;
1478 return false;
1479 // Text nodes don't have their own styles, so ignore the style on a text nod e.
1480 if (isText() && !isBR())
1481 return false;
1482 return true;
1483 } 1478 }
1484 1479
1485 inline bool LayoutObject::isAfterContent() const 1480 inline bool LayoutObject::isAfterContent() const
1486 { 1481 {
1487 if (style()->styleType() != AFTER) 1482 return style()->styleType() == AFTER;
1488 return false;
1489 // Text nodes don't have their own styles, so ignore the style on a text nod e.
1490 if (isText() && !isBR())
1491 return false;
1492 return true;
1493 } 1483 }
1494 1484
1495 inline bool LayoutObject::isBeforeOrAfterContent() const 1485 inline bool LayoutObject::isBeforeOrAfterContent() const
1496 { 1486 {
1497 return isBeforeContent() || isAfterContent(); 1487 return isBeforeContent() || isAfterContent();
1498 } 1488 }
1499 1489
1500 // setNeedsLayout() won't cause full paint invalidations as 1490 // setNeedsLayout() won't cause full paint invalidations as
1501 // setNeedsLayoutAndFullPaintInvalidation() does. Otherwise the two methods are identical. 1491 // setNeedsLayoutAndFullPaintInvalidation() does. Otherwise the two methods are identical.
1502 inline void LayoutObject::setNeedsLayout(LayoutInvalidationReasonForTracing reas on, MarkingBehavior markParents, SubtreeLayoutScope* layouter) 1492 inline void LayoutObject::setNeedsLayout(LayoutInvalidationReasonForTracing reas on, MarkingBehavior markParents, SubtreeLayoutScope* layouter)
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
1665 void showTree(const blink::LayoutObject*); 1655 void showTree(const blink::LayoutObject*);
1666 void showLineTree(const blink::LayoutObject*); 1656 void showLineTree(const blink::LayoutObject*);
1667 void showLayoutTree(const blink::LayoutObject* object1); 1657 void showLayoutTree(const blink::LayoutObject* object1);
1668 // We don't make object2 an optional parameter so that showLayoutTree 1658 // We don't make object2 an optional parameter so that showLayoutTree
1669 // can be called from gdb easily. 1659 // can be called from gdb easily.
1670 void showLayoutTree(const blink::LayoutObject* object1, const blink::LayoutObjec t* object2); 1660 void showLayoutTree(const blink::LayoutObject* object1, const blink::LayoutObjec t* object2);
1671 1661
1672 #endif 1662 #endif
1673 1663
1674 #endif // LayoutObject_h 1664 #endif // LayoutObject_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698