Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) |
| 3 * (C) 2000 Antti Koivisto (koivisto@kde.org) | 3 * (C) 2000 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2000 Dirk Mueller (mueller@kde.org) | 4 * (C) 2000 Dirk Mueller (mueller@kde.org) |
| 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) | 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) |
| 6 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All r ights reserved. | 6 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All r ights reserved. |
| 7 * Copyright (C) 2009 Google Inc. All rights reserved. | 7 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 8 * | 8 * |
| 9 * This library is free software; you can redistribute it and/or | 9 * This library is free software; you can redistribute it and/or |
| 10 * modify it under the terms of the GNU Library General Public | 10 * modify it under the terms of the GNU Library General Public |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 32 #include "sky/engine/core/editing/TextAffinity.h" | 32 #include "sky/engine/core/editing/TextAffinity.h" |
| 33 #include "sky/engine/core/fetch/ImageResourceClient.h" | 33 #include "sky/engine/core/fetch/ImageResourceClient.h" |
| 34 #include "sky/engine/core/html/HTMLElement.h" | 34 #include "sky/engine/core/html/HTMLElement.h" |
| 35 #include "sky/engine/core/rendering/HitTestRequest.h" | 35 #include "sky/engine/core/rendering/HitTestRequest.h" |
| 36 #include "sky/engine/core/rendering/PaintInvalidationState.h" | 36 #include "sky/engine/core/rendering/PaintInvalidationState.h" |
| 37 #include "sky/engine/core/rendering/PaintPhase.h" | 37 #include "sky/engine/core/rendering/PaintPhase.h" |
| 38 #include "sky/engine/core/rendering/RenderObjectChildList.h" | 38 #include "sky/engine/core/rendering/RenderObjectChildList.h" |
| 39 #include "sky/engine/core/rendering/ScrollAlignment.h" | 39 #include "sky/engine/core/rendering/ScrollAlignment.h" |
| 40 #include "sky/engine/core/rendering/SubtreeLayoutScope.h" | 40 #include "sky/engine/core/rendering/SubtreeLayoutScope.h" |
| 41 #include "sky/engine/core/rendering/compositing/CompositingState.h" | 41 #include "sky/engine/core/rendering/compositing/CompositingState.h" |
| 42 #include "sky/engine/core/rendering/compositing/CompositingTriggers.h" | |
| 43 #include "sky/engine/core/rendering/style/RenderStyle.h" | 42 #include "sky/engine/core/rendering/style/RenderStyle.h" |
| 44 #include "sky/engine/core/rendering/style/StyleInheritedData.h" | 43 #include "sky/engine/core/rendering/style/StyleInheritedData.h" |
| 45 #include "sky/engine/platform/geometry/FloatQuad.h" | 44 #include "sky/engine/platform/geometry/FloatQuad.h" |
| 46 #include "sky/engine/platform/geometry/LayoutRect.h" | 45 #include "sky/engine/platform/geometry/LayoutRect.h" |
| 47 #include "sky/engine/platform/graphics/CompositingReasons.h" | 46 #include "sky/engine/platform/graphics/CompositingReasons.h" |
| 48 #include "sky/engine/platform/transforms/TransformationMatrix.h" | 47 #include "sky/engine/platform/transforms/TransformationMatrix.h" |
| 49 | 48 |
| 50 namespace blink { | 49 namespace blink { |
| 51 | 50 |
| 52 class AffineTransform; | 51 class AffineTransform; |
| (...skipping 1117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1170 | 1169 |
| 1171 inline bool RenderObject::boxDecorationBackgroundIsKnownToBeObscured() | 1170 inline bool RenderObject::boxDecorationBackgroundIsKnownToBeObscured() |
| 1172 { | 1171 { |
| 1173 if (m_bitfields.boxDecorationBackgroundState() == HasBoxDecorationBackground ObscurationStatusInvalid) { | 1172 if (m_bitfields.boxDecorationBackgroundState() == HasBoxDecorationBackground ObscurationStatusInvalid) { |
| 1174 BoxDecorationBackgroundState state = computeBackgroundIsKnownToBeObscure d() ? HasBoxDecorationBackgroundKnownToBeObscured : HasBoxDecorationBackgroundMa yBeVisible; | 1173 BoxDecorationBackgroundState state = computeBackgroundIsKnownToBeObscure d() ? HasBoxDecorationBackgroundKnownToBeObscured : HasBoxDecorationBackgroundMa yBeVisible; |
| 1175 m_bitfields.setBoxDecorationBackgroundState(state); | 1174 m_bitfields.setBoxDecorationBackgroundState(state); |
| 1176 } | 1175 } |
| 1177 return m_bitfields.boxDecorationBackgroundState() == HasBoxDecorationBackgro undKnownToBeObscured; | 1176 return m_bitfields.boxDecorationBackgroundState() == HasBoxDecorationBackgro undKnownToBeObscured; |
| 1178 } | 1177 } |
| 1179 | 1178 |
| 1180 inline void makeMatrixRenderable(TransformationMatrix& matrix, bool has3DRenderi ng) | 1179 inline void makeMatrixRenderable(TransformationMatrix& matrix) |
| 1181 { | 1180 { |
| 1182 if (!has3DRendering) | 1181 // FIXME(sky): The old accelerated compositing code didn't do this. |
|
ojan
2014/11/26 19:38:51
Ditto here. I'm doing the non-3D path since that's
abarth-chromium
2014/11/26 19:48:36
That's right. We'll need 4x4 matrix support in Sk
| |
| 1183 matrix.makeAffine(); | 1182 // Do we need this? |
| 1183 matrix.makeAffine(); | |
| 1184 } | 1184 } |
| 1185 | 1185 |
| 1186 #define DEFINE_RENDER_OBJECT_TYPE_CASTS(thisType, predicate) \ | 1186 #define DEFINE_RENDER_OBJECT_TYPE_CASTS(thisType, predicate) \ |
| 1187 DEFINE_TYPE_CASTS(thisType, RenderObject, object, object->predicate, object. predicate) | 1187 DEFINE_TYPE_CASTS(thisType, RenderObject, object, object->predicate, object. predicate) |
| 1188 | 1188 |
| 1189 } // namespace blink | 1189 } // namespace blink |
| 1190 | 1190 |
| 1191 #ifndef NDEBUG | 1191 #ifndef NDEBUG |
| 1192 // Outside the WebCore namespace for ease of invocation from gdb. | 1192 // Outside the WebCore namespace for ease of invocation from gdb. |
| 1193 void showTree(const blink::RenderObject*); | 1193 void showTree(const blink::RenderObject*); |
| 1194 void showLineTree(const blink::RenderObject*); | 1194 void showLineTree(const blink::RenderObject*); |
| 1195 void showRenderTree(const blink::RenderObject* object1); | 1195 void showRenderTree(const blink::RenderObject* object1); |
| 1196 // We don't make object2 an optional parameter so that showRenderTree | 1196 // We don't make object2 an optional parameter so that showRenderTree |
| 1197 // can be called from gdb easily. | 1197 // can be called from gdb easily. |
| 1198 void showRenderTree(const blink::RenderObject* object1, const blink::RenderObjec t* object2); | 1198 void showRenderTree(const blink::RenderObject* object1, const blink::RenderObjec t* object2); |
| 1199 | 1199 |
| 1200 #endif | 1200 #endif |
| 1201 | 1201 |
| 1202 #endif // SKY_ENGINE_CORE_RENDERING_RENDEROBJECT_H_ | 1202 #endif // SKY_ENGINE_CORE_RENDERING_RENDEROBJECT_H_ |
| OLD | NEW |