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

Side by Side Diff: Source/core/rendering/RenderObject.h

Issue 226203010: [CSS Shapes] shape-outside from image doesn't load properly (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: corrected a flaw in clearShapeOutside that cropped up in webkit_unit_test Created 6 years, 8 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/rendering/RenderImage.cpp ('k') | Source/core/rendering/RenderObject.cpp » ('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) 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 563 matching lines...) Expand 10 before | Expand all | Expand 10 after
574 574
575 bool hasTransform() const { return m_bitfields.hasTransform(); } 575 bool hasTransform() const { return m_bitfields.hasTransform(); }
576 bool hasMask() const { return style() && style()->hasMask(); } 576 bool hasMask() const { return style() && style()->hasMask(); }
577 bool hasClipPath() const { return style() && style()->clipPath(); } 577 bool hasClipPath() const { return style() && style()->clipPath(); }
578 bool hasHiddenBackface() const { return style() && style()->backfaceVisibili ty() == BackfaceVisibilityHidden; } 578 bool hasHiddenBackface() const { return style() && style()->backfaceVisibili ty() == BackfaceVisibilityHidden; }
579 579
580 bool hasFilter() const { return style() && style()->hasFilter(); } 580 bool hasFilter() const { return style() && style()->hasFilter(); }
581 581
582 bool hasBlendMode() const; 582 bool hasBlendMode() const;
583 583
584 bool hasShapeOutside() const { return style() && style()->shapeOutside(); }
585
584 inline bool preservesNewline() const; 586 inline bool preservesNewline() const;
585 587
586 // The pseudo element style can be cached or uncached. Use the cached metho d if the pseudo element doesn't respect 588 // The pseudo element style can be cached or uncached. Use the cached metho d if the pseudo element doesn't respect
587 // any pseudo classes (and therefore has no concept of changing state). 589 // any pseudo classes (and therefore has no concept of changing state).
588 RenderStyle* getCachedPseudoStyle(PseudoId, RenderStyle* parentStyle = 0) co nst; 590 RenderStyle* getCachedPseudoStyle(PseudoId, RenderStyle* parentStyle = 0) co nst;
589 PassRefPtr<RenderStyle> getUncachedPseudoStyle(const PseudoStyleRequest&, Re nderStyle* parentStyle = 0, RenderStyle* ownStyle = 0) const; 591 PassRefPtr<RenderStyle> getUncachedPseudoStyle(const PseudoStyleRequest&, Re nderStyle* parentStyle = 0, RenderStyle* ownStyle = 0) const;
590 592
591 virtual void updateDragState(bool dragOn); 593 virtual void updateDragState(bool dragOn);
592 594
593 RenderView* view() const { return document().renderView(); }; 595 RenderView* view() const { return document().renderView(); };
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after
1068 void removeFromRenderFlowThread(); 1070 void removeFromRenderFlowThread();
1069 void removeFromRenderFlowThreadRecursive(RenderFlowThread*); 1071 void removeFromRenderFlowThreadRecursive(RenderFlowThread*);
1070 1072
1071 bool hasImmediateNonWhitespaceTextChildOrPropertiesDependentOnColor() const; 1073 bool hasImmediateNonWhitespaceTextChildOrPropertiesDependentOnColor() const;
1072 1074
1073 RenderStyle* cachedFirstLineStyle() const; 1075 RenderStyle* cachedFirstLineStyle() const;
1074 StyleDifference adjustStyleDifference(StyleDifference, unsigned contextSensi tiveProperties) const; 1076 StyleDifference adjustStyleDifference(StyleDifference, unsigned contextSensi tiveProperties) const;
1075 1077
1076 Color selectionColor(int colorProperty) const; 1078 Color selectionColor(int colorProperty) const;
1077 1079
1078 void removeShapeImageClient(ShapeValue*);
1079
1080 #ifndef NDEBUG 1080 #ifndef NDEBUG
1081 void checkBlockPositionedObjectsNeedLayout(); 1081 void checkBlockPositionedObjectsNeedLayout();
1082 #endif 1082 #endif
1083 const char* invalidationReasonToString(InvalidationReason) const; 1083 const char* invalidationReasonToString(InvalidationReason) const;
1084 1084
1085 RefPtr<RenderStyle> m_style; 1085 RefPtr<RenderStyle> m_style;
1086 1086
1087 Node* m_node; 1087 Node* m_node;
1088 1088
1089 RenderObject* m_parent; 1089 RenderObject* m_parent;
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
1444 void showTree(const WebCore::RenderObject*); 1444 void showTree(const WebCore::RenderObject*);
1445 void showLineTree(const WebCore::RenderObject*); 1445 void showLineTree(const WebCore::RenderObject*);
1446 void showRenderTree(const WebCore::RenderObject* object1); 1446 void showRenderTree(const WebCore::RenderObject* object1);
1447 // We don't make object2 an optional parameter so that showRenderTree 1447 // We don't make object2 an optional parameter so that showRenderTree
1448 // can be called from gdb easily. 1448 // can be called from gdb easily.
1449 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2); 1449 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2);
1450 1450
1451 #endif 1451 #endif
1452 1452
1453 #endif // RenderObject_h 1453 #endif // RenderObject_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderImage.cpp ('k') | Source/core/rendering/RenderObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698