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

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

Issue 189883003: Web Animations: Allow animations with delay to start on compositor (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Relax assert. Created 6 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderBoxModelObject.h ('k') | Source/core/rendering/RenderTableRow.h » ('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 *
11 * This library is distributed in the hope that it will be useful, 11 * This library is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14 * Library General Public License for more details. 14 * Library General Public License for more details.
15 * 15 *
16 * You should have received a copy of the GNU Library General Public License 16 * You should have received a copy of the GNU Library General Public License
17 * along with this library; see the file COPYING.LIB. If not, write to 17 * along with this library; see the file COPYING.LIB. If not, write to
18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
19 * Boston, MA 02110-1301, USA. 19 * Boston, MA 02110-1301, USA.
20 * 20 *
21 */ 21 */
22 22
23 #ifndef RenderInline_h 23 #ifndef RenderInline_h
24 #define RenderInline_h 24 #define RenderInline_h
25 25
26 #include "core/animation/ActiveAnimations.h"
26 #include "core/rendering/InlineFlowBox.h" 27 #include "core/rendering/InlineFlowBox.h"
27 #include "core/rendering/RenderBoxModelObject.h" 28 #include "core/rendering/RenderBoxModelObject.h"
28 #include "core/rendering/RenderLineBoxList.h" 29 #include "core/rendering/RenderLineBoxList.h"
29 30
30 namespace WebCore { 31 namespace WebCore {
31 32
32 class Position; 33 class Position;
33 34
34 class RenderInline : public RenderBoxModelObject { 35 class RenderInline : public RenderBoxModelObject {
35 public: 36 public:
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 RenderObject* beforeChild, RenderBoxModelObject* oldCont); 129 RenderObject* beforeChild, RenderBoxModelObject* oldCont);
129 void splitFlow(RenderObject* beforeChild, RenderBlock* newBlockBox, 130 void splitFlow(RenderObject* beforeChild, RenderBlock* newBlockBox,
130 RenderObject* newChild, RenderBoxModelObject* oldCont); 131 RenderObject* newChild, RenderBoxModelObject* oldCont);
131 132
132 virtual void layout() OVERRIDE FINAL { ASSERT_NOT_REACHED(); } // Do nothing for layout() 133 virtual void layout() OVERRIDE FINAL { ASSERT_NOT_REACHED(); } // Do nothing for layout()
133 134
134 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL; 135 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL;
135 136
136 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAct ion) OVERRIDE FINAL; 137 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAct ion) OVERRIDE FINAL;
137 138
138 virtual LayerType layerTypeRequired() const OVERRIDE { return isInFlowPositi oned() || createsGroup() || hasClipPath() ? NormalLayer : NoLayer; } 139 virtual LayerType layerTypeRequired() const OVERRIDE { return isInFlowPositi oned() || createsGroup() || hasClipPath() || shouldCompositeForActiveAnimations( *this) ? NormalLayer : NoLayer; }
139 140
140 virtual LayoutUnit offsetLeft() const OVERRIDE FINAL; 141 virtual LayoutUnit offsetLeft() const OVERRIDE FINAL;
141 virtual LayoutUnit offsetTop() const OVERRIDE FINAL; 142 virtual LayoutUnit offsetTop() const OVERRIDE FINAL;
142 virtual LayoutUnit offsetWidth() const OVERRIDE FINAL { return linesBounding Box().width(); } 143 virtual LayoutUnit offsetWidth() const OVERRIDE FINAL { return linesBounding Box().width(); }
143 virtual LayoutUnit offsetHeight() const OVERRIDE FINAL { return linesBoundin gBox().height(); } 144 virtual LayoutUnit offsetHeight() const OVERRIDE FINAL { return linesBoundin gBox().height(); }
144 145
145 virtual LayoutRect clippedOverflowRectForRepaint(const RenderLayerModelObjec t* repaintContainer) const OVERRIDE; 146 virtual LayoutRect clippedOverflowRectForRepaint(const RenderLayerModelObjec t* repaintContainer) const OVERRIDE;
146 virtual LayoutRect rectWithOutlineForRepaint(const RenderLayerModelObject* r epaintContainer, LayoutUnit outlineWidth) const OVERRIDE FINAL; 147 virtual LayoutRect rectWithOutlineForRepaint(const RenderLayerModelObject* r epaintContainer, LayoutUnit outlineWidth) const OVERRIDE FINAL;
147 virtual void computeRectForRepaint(const RenderLayerModelObject* repaintCont ainer, LayoutRect&, bool fixed) const OVERRIDE FINAL; 148 virtual void computeRectForRepaint(const RenderLayerModelObject* repaintCont ainer, LayoutRect&, bool fixed) const OVERRIDE FINAL;
148 149
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 RenderLineBoxList m_lineBoxes; // All of the line boxes created for this i nline flow. For example, <i>Hello<br>world.</i> will have two <i> line boxes. 186 RenderLineBoxList m_lineBoxes; // All of the line boxes created for this i nline flow. For example, <i>Hello<br>world.</i> will have two <i> line boxes.
186 187
187 bool m_alwaysCreateLineBoxes : 1; 188 bool m_alwaysCreateLineBoxes : 1;
188 }; 189 };
189 190
190 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderInline, isRenderInline()); 191 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderInline, isRenderInline());
191 192
192 } // namespace WebCore 193 } // namespace WebCore
193 194
194 #endif // RenderInline_h 195 #endif // RenderInline_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBoxModelObject.h ('k') | Source/core/rendering/RenderTableRow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698