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

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: Add dynamic test and fix stuff 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/transforms/TransformationMatrix.h" 43 #include "platform/transforms/TransformationMatrix.h"
43 #include "public/platform/WebCompositorAnimationDelegate.h" 44 #include "public/platform/WebCompositorAnimationDelegate.h"
44 #include "public/platform/WebContentLayer.h" 45 #include "public/platform/WebContentLayer.h"
45 #include "public/platform/WebImageLayer.h" 46 #include "public/platform/WebImageLayer.h"
46 #include "public/platform/WebLayerClient.h" 47 #include "public/platform/WebLayerClient.h"
47 #include "public/platform/WebLayerScrollClient.h" 48 #include "public/platform/WebLayerScrollClient.h"
48 #include "public/platform/WebScrollBlocksOn.h" 49 #include "public/platform/WebScrollBlocksOn.h"
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 void setContentsRect(const IntRect&); 196 void setContentsRect(const IntRect&);
196 197
197 // Return true if the animation is handled by the compositing system. If thi s returns 198 // Return true if the animation is handled by the compositing system. If thi s returns
198 // false, the animation will be run by AnimationController. 199 // false, the animation will be run by AnimationController.
199 // These methods handle both transitions and keyframe animations. 200 // These methods handle both transitions and keyframe animations.
200 bool addAnimation(PassOwnPtr<WebCompositorAnimation>); 201 bool addAnimation(PassOwnPtr<WebCompositorAnimation>);
201 void pauseAnimation(int animationId, double /*timeOffset*/); 202 void pauseAnimation(int animationId, double /*timeOffset*/);
202 void removeAnimation(int animationId); 203 void removeAnimation(int animationId);
203 204
204 // Layer contents 205 // Layer contents
205 void setContentsToImage(Image*); 206 void setContentsToImage(Image*, RespectImageOrientationEnum = DoNotRespectIm ageOrientation);
206 void setContentsToPlatformLayer(WebLayer* layer) { setContentsTo(layer); } 207 void setContentsToPlatformLayer(WebLayer* layer) { setContentsTo(layer); }
207 bool hasContentsLayer() const { return m_contentsLayer; } 208 bool hasContentsLayer() const { return m_contentsLayer; }
208 209
209 // For hosting this GraphicsLayer in a native layer hierarchy. 210 // For hosting this GraphicsLayer in a native layer hierarchy.
210 WebLayer* platformLayer() const; 211 WebLayer* platformLayer() const;
211 212
212 typedef HashMap<int, int> RenderingContextMap; 213 typedef HashMap<int, int> RenderingContextMap;
213 PassRefPtr<JSONObject> layerTreeAsJSON(LayerTreeFlags, RenderingContextMap&) const; 214 PassRefPtr<JSONObject> layerTreeAsJSON(LayerTreeFlags, RenderingContextMap&) const;
214 215
215 int paintCount() const { return m_paintCount; } 216 int paintCount() const { return m_paintCount; }
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 }; 366 };
366 367
367 } // namespace blink 368 } // namespace blink
368 369
369 #ifndef NDEBUG 370 #ifndef NDEBUG
370 // Outside the blink namespace for ease of invocation from gdb. 371 // Outside the blink namespace for ease of invocation from gdb.
371 void PLATFORM_EXPORT showGraphicsLayerTree(const blink::GraphicsLayer*); 372 void PLATFORM_EXPORT showGraphicsLayerTree(const blink::GraphicsLayer*);
372 #endif 373 #endif
373 374
374 #endif // GraphicsLayer_h 375 #endif // GraphicsLayer_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698