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

Side by Side Diff: third_party/WebKit/Source/platform/graphics/GraphicsLayer.h

Issue 1361413004: Fix directly composited image path for CSS image-orientation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Patch for landing Created 5 years, 2 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) 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2009 Apple Inc. All rights reserved.
3 * Copyright (C) 2013 Intel Corporation. All rights reserved. 3 * Copyright (C) 2013 Intel Corporation. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 18 matching lines...) Expand all
29 29
30 #include "platform/PlatformExport.h" 30 #include "platform/PlatformExport.h"
31 #include "platform/geometry/FloatPoint.h" 31 #include "platform/geometry/FloatPoint.h"
32 #include "platform/geometry/FloatPoint3D.h" 32 #include "platform/geometry/FloatPoint3D.h"
33 #include "platform/geometry/FloatSize.h" 33 #include "platform/geometry/FloatSize.h"
34 #include "platform/geometry/IntRect.h" 34 #include "platform/geometry/IntRect.h"
35 #include "platform/graphics/Color.h" 35 #include "platform/graphics/Color.h"
36 #include "platform/graphics/ContentLayerDelegate.h" 36 #include "platform/graphics/ContentLayerDelegate.h"
37 #include "platform/graphics/GraphicsLayerClient.h" 37 #include "platform/graphics/GraphicsLayerClient.h"
38 #include "platform/graphics/GraphicsLayerDebugInfo.h" 38 #include "platform/graphics/GraphicsLayerDebugInfo.h"
39 #include "platform/graphics/ImageOrientation.h"
39 #include "platform/graphics/PaintInvalidationReason.h" 40 #include "platform/graphics/PaintInvalidationReason.h"
40 #include "platform/graphics/filters/FilterOperations.h" 41 #include "platform/graphics/filters/FilterOperations.h"
41 #include "platform/graphics/paint/DisplayItemClient.h" 42 #include "platform/graphics/paint/DisplayItemClient.h"
42 #include "platform/graphics/paint/DisplayItemList.h" 43 #include "platform/graphics/paint/DisplayItemList.h"
43 #include "platform/transforms/TransformationMatrix.h" 44 #include "platform/transforms/TransformationMatrix.h"
44 #include "public/platform/WebCompositorAnimationDelegate.h" 45 #include "public/platform/WebCompositorAnimationDelegate.h"
45 #include "public/platform/WebContentLayer.h" 46 #include "public/platform/WebContentLayer.h"
46 #include "public/platform/WebImageLayer.h" 47 #include "public/platform/WebImageLayer.h"
47 #include "public/platform/WebLayerClient.h" 48 #include "public/platform/WebLayerClient.h"
48 #include "public/platform/WebLayerScrollClient.h" 49 #include "public/platform/WebLayerScrollClient.h"
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 void setContentsRect(const IntRect&); 201 void setContentsRect(const IntRect&);
201 202
202 // Return true if the animation is handled by the compositing system. If thi s returns 203 // Return true if the animation is handled by the compositing system. If thi s returns
203 // false, the animation will be run by AnimationController. 204 // false, the animation will be run by AnimationController.
204 // These methods handle both transitions and keyframe animations. 205 // These methods handle both transitions and keyframe animations.
205 bool addAnimation(PassOwnPtr<WebCompositorAnimation>); 206 bool addAnimation(PassOwnPtr<WebCompositorAnimation>);
206 void pauseAnimation(int animationId, double /*timeOffset*/); 207 void pauseAnimation(int animationId, double /*timeOffset*/);
207 void removeAnimation(int animationId); 208 void removeAnimation(int animationId);
208 209
209 // Layer contents 210 // Layer contents
210 void setContentsToImage(Image*); 211 void setContentsToImage(Image*, RespectImageOrientationEnum = DoNotRespectIm ageOrientation);
211 void setContentsToPlatformLayer(WebLayer* layer) { setContentsTo(layer); } 212 void setContentsToPlatformLayer(WebLayer* layer) { setContentsTo(layer); }
212 bool hasContentsLayer() const { return m_contentsLayer; } 213 bool hasContentsLayer() const { return m_contentsLayer; }
213 214
214 // For hosting this GraphicsLayer in a native layer hierarchy. 215 // For hosting this GraphicsLayer in a native layer hierarchy.
215 WebLayer* platformLayer() const; 216 WebLayer* platformLayer() const;
216 217
217 typedef HashMap<int, int> RenderingContextMap; 218 typedef HashMap<int, int> RenderingContextMap;
218 PassRefPtr<JSONObject> layerTreeAsJSON(LayerTreeFlags, RenderingContextMap&) const; 219 PassRefPtr<JSONObject> layerTreeAsJSON(LayerTreeFlags, RenderingContextMap&) const;
219 220
220 int paintCount() const { return m_paintCount; } 221 int paintCount() const { return m_paintCount; }
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 }; 381 };
381 382
382 } // namespace blink 383 } // namespace blink
383 384
384 #ifndef NDEBUG 385 #ifndef NDEBUG
385 // Outside the blink namespace for ease of invocation from gdb. 386 // Outside the blink namespace for ease of invocation from gdb.
386 void PLATFORM_EXPORT showGraphicsLayerTree(const blink::GraphicsLayer*); 387 void PLATFORM_EXPORT showGraphicsLayerTree(const blink::GraphicsLayer*);
387 #endif 388 #endif
388 389
389 #endif // GraphicsLayer_h 390 #endif // GraphicsLayer_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/DragImage.cpp ('k') | third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698