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

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

Issue 9252031: Merge 104123 - Crash due to first-letter block processing (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
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, 2006, 2007, 2009 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2006, 2007, 2009 Apple Inc. All rights reserved.
5 * Copyright (C) 2010 Google Inc. All rights reserved. 5 * Copyright (C) 2010 Google Inc. 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 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 bool borderObscuresBackgroundEdge(const FloatSize& contextScale) const; 187 bool borderObscuresBackgroundEdge(const FloatSize& contextScale) const;
188 bool borderObscuresBackground() const; 188 bool borderObscuresBackground() const;
189 189
190 bool shouldPaintAtLowQuality(GraphicsContext*, Image*, const void*, const La youtSize&); 190 bool shouldPaintAtLowQuality(GraphicsContext*, Image*, const void*, const La youtSize&);
191 191
192 RenderBoxModelObject* continuation() const; 192 RenderBoxModelObject* continuation() const;
193 void setContinuation(RenderBoxModelObject*); 193 void setContinuation(RenderBoxModelObject*);
194 194
195 static bool shouldAntialiasLines(GraphicsContext*); 195 static bool shouldAntialiasLines(GraphicsContext*);
196 196
197 public:
198 // For RenderBlocks and RenderInlines with m_style->styleType() == FIRST_LET TER, this tracks their remaining text fragments
199 RenderObject* firstLetterRemainingText() const;
200 void setFirstLetterRemainingText(RenderObject*);
201
197 private: 202 private:
198 virtual bool isBoxModelObject() const { return true; } 203 virtual bool isBoxModelObject() const { return true; }
199 204
200 IntSize calculateFillTileSize(const FillLayer*, const IntSize& scaledPositio ningAreaSize) const; 205 IntSize calculateFillTileSize(const FillLayer*, const IntSize& scaledPositio ningAreaSize) const;
201 IntSize calculateImageIntrinsicDimensions(StyleImage*, const IntSize& scaled PositioningAreaSize) const; 206 IntSize calculateImageIntrinsicDimensions(StyleImage*, const IntSize& scaled PositioningAreaSize) const;
202 207
203 RoundedRect getBackgroundRoundedRect(const LayoutRect&, InlineFlowBox*, Layo utUnit inlineBoxWidth, LayoutUnit inlineBoxHeight, 208 RoundedRect getBackgroundRoundedRect(const LayoutRect&, InlineFlowBox*, Layo utUnit inlineBoxWidth, LayoutUnit inlineBoxHeight,
204 bool includeLogicalLeftEdge, bool includeLogicalRightEdge); 209 bool includeLogicalLeftEdge, bool includeLogicalRightEdge);
205 210
206 void clipBorderSidePolygon(GraphicsContext*, const RoundedRect& outerBorder, const RoundedRect& innerBorder, 211 void clipBorderSidePolygon(GraphicsContext*, const RoundedRect& outerBorder, const RoundedRect& innerBorder,
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 ASSERT(!object || object->isBoxModelObject()); 244 ASSERT(!object || object->isBoxModelObject());
240 return static_cast<const RenderBoxModelObject*>(object); 245 return static_cast<const RenderBoxModelObject*>(object);
241 } 246 }
242 247
243 // This will catch anyone doing an unnecessary cast. 248 // This will catch anyone doing an unnecessary cast.
244 void toRenderBoxModelObject(const RenderBoxModelObject*); 249 void toRenderBoxModelObject(const RenderBoxModelObject*);
245 250
246 } // namespace WebCore 251 } // namespace WebCore
247 252
248 #endif // RenderBoxModelObject_h 253 #endif // RenderBoxModelObject_h
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderBlock.cpp ('k') | Source/WebCore/rendering/RenderBoxModelObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698