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

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

Issue 9249043: Merge 104123 - Crash due to first-letter block processing (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/912/
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 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 bool borderObscuresBackgroundEdge(const FloatSize& contextScale) const; 185 bool borderObscuresBackgroundEdge(const FloatSize& contextScale) const;
186 bool borderObscuresBackground() const; 186 bool borderObscuresBackground() const;
187 187
188 bool shouldPaintAtLowQuality(GraphicsContext*, Image*, const void*, const La youtSize&); 188 bool shouldPaintAtLowQuality(GraphicsContext*, Image*, const void*, const La youtSize&);
189 189
190 RenderBoxModelObject* continuation() const; 190 RenderBoxModelObject* continuation() const;
191 void setContinuation(RenderBoxModelObject*); 191 void setContinuation(RenderBoxModelObject*);
192 192
193 static bool shouldAntialiasLines(GraphicsContext*); 193 static bool shouldAntialiasLines(GraphicsContext*);
194 194
195 public:
196 // For RenderBlocks and RenderInlines with m_style->styleType() == FIRST_LET TER, this tracks their remaining text fragments
197 RenderObject* firstLetterRemainingText() const;
198 void setFirstLetterRemainingText(RenderObject*);
199
195 private: 200 private:
196 virtual bool isBoxModelObject() const { return true; } 201 virtual bool isBoxModelObject() const { return true; }
197 202
198 LayoutSize calculateFillTileSize(const FillLayer*, LayoutSize scaledSize) co nst; 203 LayoutSize calculateFillTileSize(const FillLayer*, LayoutSize scaledSize) co nst;
199 204
200 RoundedRect getBackgroundRoundedRect(const LayoutRect&, InlineFlowBox*, Layo utUnit inlineBoxWidth, LayoutUnit inlineBoxHeight, 205 RoundedRect getBackgroundRoundedRect(const LayoutRect&, InlineFlowBox*, Layo utUnit inlineBoxWidth, LayoutUnit inlineBoxHeight,
201 bool includeLogicalLeftEdge, bool includeLogicalRightEdge); 206 bool includeLogicalLeftEdge, bool includeLogicalRightEdge);
202 207
203 void clipBorderSidePolygon(GraphicsContext*, const RoundedRect& outerBorder, const RoundedRect& innerBorder, 208 void clipBorderSidePolygon(GraphicsContext*, const RoundedRect& outerBorder, const RoundedRect& innerBorder,
204 BoxSide, bool firstEdgeMatches, bool secondEdgeMa tches); 209 BoxSide, bool firstEdgeMatches, bool secondEdgeMa tches);
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 ASSERT(!object || object->isBoxModelObject()); 241 ASSERT(!object || object->isBoxModelObject());
237 return static_cast<const RenderBoxModelObject*>(object); 242 return static_cast<const RenderBoxModelObject*>(object);
238 } 243 }
239 244
240 // This will catch anyone doing an unnecessary cast. 245 // This will catch anyone doing an unnecessary cast.
241 void toRenderBoxModelObject(const RenderBoxModelObject*); 246 void toRenderBoxModelObject(const RenderBoxModelObject*);
242 247
243 } // namespace WebCore 248 } // namespace WebCore
244 249
245 #endif // RenderBoxModelObject_h 250 #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