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

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

Issue 9290001: Revert 105784 - Merge 104121 - Source/WebCore: Crash in RenderRegion::getRegionRangeForBox. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/963/
Patch Set: Created 8 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
« no previous file with comments | « Source/WebCore/rendering/RenderBox.cpp ('k') | Source/WebCore/rendering/RenderFlowThread.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 2011 Adobe Systems Incorporated. All Rights Reserved. 2 * Copyright 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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 void computeLogicalWidth(); 82 void computeLogicalWidth();
83 void computeLogicalHeight(); 83 void computeLogicalHeight();
84 84
85 void paintIntoRegion(PaintInfo&, RenderRegion*, const LayoutPoint& paintOffs et); 85 void paintIntoRegion(PaintInfo&, RenderRegion*, const LayoutPoint& paintOffs et);
86 bool hitTestRegion(RenderRegion*, const HitTestRequest&, HitTestResult&, con st LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset); 86 bool hitTestRegion(RenderRegion*, const HitTestRequest&, HitTestResult&, con st LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset);
87 87
88 bool hasRegions() const { return m_regionList.size(); } 88 bool hasRegions() const { return m_regionList.size(); }
89 bool hasValidRegions() const { ASSERT(!m_regionsInvalidated); return m_hasVa lidRegions; } 89 bool hasValidRegions() const { ASSERT(!m_regionsInvalidated); return m_hasVa lidRegions; }
90 90
91 void invalidateRegions() { m_regionsInvalidated = true; setNeedsLayout(true) ; } 91 void invalidateRegions() { m_regionsInvalidated = true; setNeedsLayout(true) ; }
92 bool hasValidRegionInfo() const { return !m_regionsInvalidated && hasValidRe gions(); }
93 92
94 static PassRefPtr<RenderStyle> createFlowThreadStyle(RenderStyle* parentStyl e); 93 static PassRefPtr<RenderStyle> createFlowThreadStyle(RenderStyle* parentStyl e);
95 94
96 void styleDidChange(StyleDifference, const RenderStyle* oldStyle); 95 void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
97 96
98 void pushDependencies(RenderFlowThreadList&); 97 void pushDependencies(RenderFlowThreadList&);
99 98
100 void repaintRectangleInRegions(const LayoutRect&, bool immediate); 99 void repaintRectangleInRegions(const LayoutRect&, bool immediate);
101 100
102 LayoutUnit regionLogicalWidthForLine(LayoutUnit position) const; 101 LayoutUnit regionLogicalWidthForLine(LayoutUnit position) const;
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 ASSERT(!object || object->isRenderFlowThread()); 189 ASSERT(!object || object->isRenderFlowThread());
191 return static_cast<const RenderFlowThread*>(object); 190 return static_cast<const RenderFlowThread*>(object);
192 } 191 }
193 192
194 // This will catch anyone doing an unnecessary cast. 193 // This will catch anyone doing an unnecessary cast.
195 void toRenderFlowThread(const RenderFlowThread*); 194 void toRenderFlowThread(const RenderFlowThread*);
196 195
197 } // namespace WebCore 196 } // namespace WebCore
198 197
199 #endif // RenderFlowThread_h 198 #endif // RenderFlowThread_h
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderBox.cpp ('k') | Source/WebCore/rendering/RenderFlowThread.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698