Imported WebKit commit 499c84c99aa98e9870fa7eaa57db476c6d160d46 (http://svn.webkit.org/repository/webkit/trunk@119200)

Weekly update :). Particularly relevant changes for Qt are the use of the WebCore image decoders and direct usage
of libpng/libjpeg if available in the system.

1 files changed, 6 insertions, 6 deletions

diff --git a/Source/WebKit/chromium/tests/LinkHighlightTest.cpp b/Source/WebKit/chromium/tests/LinkHighlightTest.cpp
index edcfd4a63..be467a0d5 100644
--- a/Source/WebKit/chromium/tests/LinkHighlightTest.cpp
+++ b/Source/WebKit/chromium/tests/LinkHighlightTest.cpp
@@ -31,11 +31,12 @@
 #include "GraphicsLayerClient.h"
 #include "IntRect.h"
 #include "Path.h"
-#include "TransformationMatrix.h"
 #include <gtest/gtest.h>
+#include <public/WebTransformationMatrix.h>
 #include <wtf/PassOwnPtr.h>
 
 using namespace WebCore;
+using WebKit::WebTransformationMatrix;
 
 namespace {
 
@@ -63,11 +64,10 @@ TEST(LinkHighlightTest, verifyLinkHighlightLayer)
     EXPECT_TRUE(contentLayer->transform().isIdentityOrTranslation());
     EXPECT_TRUE(contentLayer->transform().isIntegerTranslation());
 
-    TransformationMatrix::DecomposedType decomposition;
-    EXPECT_TRUE(contentLayer->transform().decompose(decomposition));
-
-    FloatPoint expectedTranslation(pathBoundingRect.x() + pathBoundingRect.width() / 2, pathBoundingRect.y() + pathBoundingRect.height() / 2);
-    EXPECT_EQ(FloatPoint(decomposition.translateX, decomposition.translateY), expectedTranslation);
+    float expectedXTranslation = pathBoundingRect.x() + pathBoundingRect.width() / 2;
+    float expectedYTranslation = pathBoundingRect.y() + pathBoundingRect.height() / 2;
+    EXPECT_FLOAT_EQ(expectedXTranslation, contentLayer->transform().m41());
+    EXPECT_FLOAT_EQ(expectedYTranslation, contentLayer->transform().m42());
 }
 
 TEST(LinkHighlightTest, verifyGraphicsLayerChromiumEmbedding)