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

Side by Side Diff: sky/engine/core/rendering/RenderObject.h

Issue 958463002: Cleanup transform-related methods in RenderLayer. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: improve test Created 5 years, 10 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 | « sky/engine/core/rendering/RenderLayer.cpp ('k') | sky/engine/core/rendering/RenderObject.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) 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 862 matching lines...) Expand 10 before | Expand all | Expand 10 after
873 } 873 }
874 874
875 inline void RenderObject::setSelectionStateIfNeeded(SelectionState state) 875 inline void RenderObject::setSelectionStateIfNeeded(SelectionState state)
876 { 876 {
877 if (selectionState() == state) 877 if (selectionState() == state)
878 return; 878 return;
879 879
880 setSelectionState(state); 880 setSelectionState(state);
881 } 881 }
882 882
883 inline void makeMatrixRenderable(TransformationMatrix& matrix)
884 {
885 // FIXME(sky): We shouldn't need to do this once Skia has 4x4 matrix support .
886 // Until then, 3d transforms don't work right.
887 matrix.makeAffine();
888 }
889
890 #define DEFINE_RENDER_OBJECT_TYPE_CASTS(thisType, predicate) \ 883 #define DEFINE_RENDER_OBJECT_TYPE_CASTS(thisType, predicate) \
891 DEFINE_TYPE_CASTS(thisType, RenderObject, object, object->predicate, object. predicate) 884 DEFINE_TYPE_CASTS(thisType, RenderObject, object, object->predicate, object. predicate)
892 885
893 } // namespace blink 886 } // namespace blink
894 887
895 #ifndef NDEBUG 888 #ifndef NDEBUG
896 // Outside the WebCore namespace for ease of invocation from gdb. 889 // Outside the WebCore namespace for ease of invocation from gdb.
897 void showTree(const blink::RenderObject*); 890 void showTree(const blink::RenderObject*);
898 void showLineTree(const blink::RenderObject*); 891 void showLineTree(const blink::RenderObject*);
899 void showRenderTree(const blink::RenderObject* object1); 892 void showRenderTree(const blink::RenderObject* object1);
900 // We don't make object2 an optional parameter so that showRenderTree 893 // We don't make object2 an optional parameter so that showRenderTree
901 // can be called from gdb easily. 894 // can be called from gdb easily.
902 void showRenderTree(const blink::RenderObject* object1, const blink::RenderObjec t* object2); 895 void showRenderTree(const blink::RenderObject* object1, const blink::RenderObjec t* object2);
903 896
904 #endif 897 #endif
905 898
906 #endif // SKY_ENGINE_CORE_RENDERING_RENDEROBJECT_H_ 899 #endif // SKY_ENGINE_CORE_RENDERING_RENDEROBJECT_H_
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderLayer.cpp ('k') | sky/engine/core/rendering/RenderObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698