From 6dbcd09121fe266c7704a524b5cbd7f2754659c0 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 20 Sep 2012 14:01:09 +0200 Subject: Imported WebKit commit 080af0beaa6f0ba8ff8f44cb8bd8b5dcf75ac0af (http://svn.webkit.org/repository/webkit/trunk@129119) New snapshot with prospective build fix for incorrect QtWebKit master module header file creation --- .../OpaqueRectTrackingContentLayerDelegateTest.cpp | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'Source/WebKit/chromium/tests/OpaqueRectTrackingContentLayerDelegateTest.cpp') diff --git a/Source/WebKit/chromium/tests/OpaqueRectTrackingContentLayerDelegateTest.cpp b/Source/WebKit/chromium/tests/OpaqueRectTrackingContentLayerDelegateTest.cpp index 38b0c9885..0cf82494b 100644 --- a/Source/WebKit/chromium/tests/OpaqueRectTrackingContentLayerDelegateTest.cpp +++ b/Source/WebKit/chromium/tests/OpaqueRectTrackingContentLayerDelegateTest.cpp @@ -29,6 +29,7 @@ #include "Color.h" #include "GraphicsContext.h" #include "IntRect.h" +#include "PlatformContextSkia.h" #include "skia/ext/platform_canvas.h" #include #include @@ -100,6 +101,22 @@ struct PaintFillPartialOpaque : public PaintCallback { IntRect m_opaqueRect; }; +#if defined(SK_SUPPORT_HINTING_SCALE_FACTOR) +struct HintingScaleCallback : public PaintCallback { + HintingScaleCallback() + : hintingScale(SK_Scalar1) + { + } + + virtual void operator()(GraphicsContext& context, const IntRect& contentRect) + { + hintingScale = context.platformContext()->hintingScaleFactor(); + } + + SkScalar hintingScale; +}; +#endif + #define EXPECT_EQ_RECT(a, b) \ EXPECT_EQ(a.x, b.x); \ EXPECT_EQ(a.width, b.width); \ @@ -194,4 +211,23 @@ TEST_F(OpaqueRectTrackingContentLayerDelegateTest, testPartialOpaqueRectTranslat EXPECT_EQ_RECT(WebFloatRect(partialRect.x(), partialRect.y(), partialRect.width(), partialRect.height()), opaqueRect); } +#if defined(SK_SUPPORT_HINTING_SCALE_FACTOR) +TEST_F(OpaqueRectTrackingContentLayerDelegateTest, testHintingScaleFactorSet) +{ + HintingScaleCallback callback; + TestLayerPainterChromium painter(callback); + OpaqueRectTrackingContentLayerDelegate delegate(&painter); + + SkScalar hintingScale = SkIntToScalar(2); + SkCanvas canvas; + canvas.scale(hintingScale, hintingScale); + EXPECT_EQ(callback.hintingScale, SK_Scalar1); + + IntRect rectA; + WebFloatRect rectB; + delegate.paintContents(&canvas, rectA, rectB); + EXPECT_EQ(callback.hintingScale, hintingScale); +} +#endif + } // namespace -- cgit v1.2.1