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

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

Issue 12616003: Merge 144350 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 9 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/RenderInline.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) 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, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 InlineBox* firstLineBoxIncludingCulling() const { return alwaysCreateLineBox es() ? firstLineBox() : culledInlineFirstLineBox(); } 74 InlineBox* firstLineBoxIncludingCulling() const { return alwaysCreateLineBox es() ? firstLineBox() : culledInlineFirstLineBox(); }
75 InlineBox* lastLineBoxIncludingCulling() const { return alwaysCreateLineBoxe s() ? lastLineBox() : culledInlineLastLineBox(); } 75 InlineBox* lastLineBoxIncludingCulling() const { return alwaysCreateLineBoxe s() ? lastLineBox() : culledInlineLastLineBox(); }
76 76
77 virtual RenderBoxModelObject* virtualContinuation() const { return continuat ion(); } 77 virtual RenderBoxModelObject* virtualContinuation() const { return continuat ion(); }
78 RenderInline* inlineElementContinuation() const; 78 RenderInline* inlineElementContinuation() const;
79 79
80 virtual void updateDragState(bool dragOn); 80 virtual void updateDragState(bool dragOn);
81 81
82 LayoutSize offsetForInFlowPositionedInline(const RenderBox* child) const; 82 LayoutSize offsetForInFlowPositionedInline(const RenderBox* child) const;
83 83
84 virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint&); 84 virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& addition alOffset, const RenderLayerModelObject* paintContainer = 0) OVERRIDE;
85 void paintOutline(GraphicsContext*, const LayoutPoint&); 85 void paintOutline(PaintInfo&, const LayoutPoint&);
86 86
87 using RenderBoxModelObject::continuation; 87 using RenderBoxModelObject::continuation;
88 using RenderBoxModelObject::setContinuation; 88 using RenderBoxModelObject::setContinuation;
89 89
90 bool alwaysCreateLineBoxes() const { return m_alwaysCreateLineBoxes; } 90 bool alwaysCreateLineBoxes() const { return m_alwaysCreateLineBoxes; }
91 void setAlwaysCreateLineBoxes() { m_alwaysCreateLineBoxes = true; } 91 void setAlwaysCreateLineBoxes() { m_alwaysCreateLineBoxes = true; }
92 void updateAlwaysCreateLineBoxes(bool fullLayout); 92 void updateAlwaysCreateLineBoxes(bool fullLayout);
93 93
94 virtual LayoutRect localCaretRect(InlineBox*, int, LayoutUnit* extraWidthToE ndOfLine) OVERRIDE; 94 virtual LayoutRect localCaretRect(InlineBox*, int, LayoutUnit* extraWidthToE ndOfLine) OVERRIDE;
95 95
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 ASSERT_WITH_SECURITY_IMPLICATION(!object || object->isRenderInline()); 199 ASSERT_WITH_SECURITY_IMPLICATION(!object || object->isRenderInline());
200 return static_cast<const RenderInline*>(object); 200 return static_cast<const RenderInline*>(object);
201 } 201 }
202 202
203 // This will catch anyone doing an unnecessary cast. 203 // This will catch anyone doing an unnecessary cast.
204 void toRenderInline(const RenderInline*); 204 void toRenderInline(const RenderInline*);
205 205
206 } // namespace WebCore 206 } // namespace WebCore
207 207
208 #endif // RenderInline_h 208 #endif // RenderInline_h
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderBox.cpp ('k') | Source/WebCore/rendering/RenderInline.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698