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

Unified Diff: third_party/WebKit/Source/platform/DragImage.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, 3 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/DragImage.h
diff --git a/third_party/WebKit/Source/platform/DragImage.h b/third_party/WebKit/Source/platform/DragImage.h
index 6c3acfa7ff33bb1cb15fbbbbb19f19f764e76c32..504c60799755a2e05b7c9ac62d584e734f5a11f9 100644
--- a/third_party/WebKit/Source/platform/DragImage.h
+++ b/third_party/WebKit/Source/platform/DragImage.h
@@ -32,6 +32,7 @@
#include "platform/graphics/ImageOrientation.h"
#include "platform/graphics/paint/DisplayItemClient.h"
#include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/skia/include/core/SkImage.h"
#include "wtf/Forward.h"
namespace blink {
@@ -45,12 +46,12 @@ public:
static PassOwnPtr<DragImage> create(Image*,
RespectImageOrientationEnum = DoNotRespectImageOrientation, float deviceScaleFactor = 1,
InterpolationQuality = InterpolationHigh, float opacity = 1,
- const FloatSize& imageScale = FloatSize(1, 1));
+ FloatSize imageScale = FloatSize(1, 1));
static PassOwnPtr<DragImage> create(const KURL&, const String& label, const FontDescription& systemFont, float deviceScaleFactor);
~DragImage();
- static FloatSize clampedImageScale(const Image&, const IntSize&, const IntSize& maxSize);
+ static FloatSize clampedImageScale(const IntSize&, const IntSize&, const IntSize& maxSize);
const SkBitmap& bitmap() { return m_bitmap; }
float resolutionScale() const { return m_resolutionScale; }
@@ -68,6 +69,9 @@ private:
InterpolationQuality m_interpolationQuality;
};
+PassRefPtr<SkImage> adjustedImage(PassRefPtr<SkImage>, const IntSize&,
+ const AffineTransform&, float opacity, InterpolationQuality = InterpolationNone);
+
}
#endif // DragImage_h

Powered by Google App Engine
This is Rietveld 408576698