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

Side by Side Diff: Source/WebCore/rendering/RenderRegion.h

Issue 10911116: Merge 126048 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1229/
Patch Set: Created 8 years, 3 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/WebCore/rendering/RenderQuote.cpp ('k') | Source/WebCore/rendering/RenderRegion.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) 2011 Adobe Systems Incorporated. All rights reserved. 2 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above 8 * 1. Redistributions of source code must retain the above
9 * copyright notice, this list of conditions and the following 9 * copyright notice, this list of conditions and the following
10 * disclaimer. 10 * disclaimer.
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 RegionState regionState() const { return isValid() ? m_regionState : RegionU ndefined; } 94 RegionState regionState() const { return isValid() ? m_regionState : RegionU ndefined; }
95 void setRegionState(RegionState regionState) { m_regionState = regionState; } 95 void setRegionState(RegionState regionState) { m_regionState = regionState; }
96 96
97 virtual LayoutUnit logicalWidthForFlowThreadContent() const; 97 virtual LayoutUnit logicalWidthForFlowThreadContent() const;
98 virtual LayoutUnit logicalHeightForFlowThreadContent() const; 98 virtual LayoutUnit logicalHeightForFlowThreadContent() const;
99 99
100 private: 100 private:
101 virtual const char* renderName() const { return "RenderRegion"; } 101 virtual const char* renderName() const { return "RenderRegion"; }
102 102
103 virtual void insertedIntoTree() OVERRIDE; 103 virtual void insertedIntoTree() OVERRIDE;
104 virtual void willBeRemovedFromTree() OVERRIDE;
104 105
105 PassRefPtr<RenderStyle> computeStyleInRegion(const RenderObject*); 106 PassRefPtr<RenderStyle> computeStyleInRegion(const RenderObject*);
106 void computeChildrenStyleInRegion(const RenderObject*); 107 void computeChildrenStyleInRegion(const RenderObject*);
107 void setRegionObjectsRegionStyle(); 108 void setRegionObjectsRegionStyle();
108 void restoreRegionObjectsOriginalStyle(); 109 void restoreRegionObjectsOriginalStyle();
109 void setObjectStyleInRegion(RenderObject*, PassRefPtr<RenderStyle>, bool obj ectRegionStyleCached); 110 void setObjectStyleInRegion(RenderObject*, PassRefPtr<RenderStyle>, bool obj ectRegionStyleCached);
110 void printRegionObjectsStyles(); 111 void printRegionObjectsStyles();
111 RenderFlowThread* m_flowThread; 112 RenderFlowThread* m_flowThread;
112 113
113 // If this RenderRegion is displayed as part of another named flow, 114 // If this RenderRegion is displayed as part of another named flow,
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 ASSERT(!object || object->isRenderRegion()); 153 ASSERT(!object || object->isRenderRegion());
153 return static_cast<const RenderRegion*>(object); 154 return static_cast<const RenderRegion*>(object);
154 } 155 }
155 156
156 // This will catch anyone doing an unnecessary cast. 157 // This will catch anyone doing an unnecessary cast.
157 void toRenderRegion(const RenderRegion*); 158 void toRenderRegion(const RenderRegion*);
158 159
159 } // namespace WebCore 160 } // namespace WebCore
160 161
161 #endif // RenderRegion_h 162 #endif // RenderRegion_h
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderQuote.cpp ('k') | Source/WebCore/rendering/RenderRegion.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698