commit 331988fa8c838c8321da028ed0afa97d8bd23318
author Steve Block <steveblock@google.com> Thu Feb 18 16:55:56 2010 +0000
committer Steve Block <steveblock@google.com> Mon Feb 22 14:32:40 2010 +0000
tree 0abcd9000ee920f50bd55de2c53812092cc6a7ac
parent 4c319d7f42caf55d18590789400692ea9d6109c1

Update Android to reflect upstreaming of matrix optimization in RenderLayer.cpp

See http://trac.webkit.org/changeset/55081

Change-Id: If34e70743c554b2a5e8315b2657cce6964805f6a

WebCore/config.h

diff --git a/WebCore/config.h b/WebCore/config.h
index 4a532b8..8494f9e 100644
--- a/WebCore/config.h
+++ b/WebCore/config.h
@@ -129,9 +129,6 @@
 #define FLATTEN_FRAMESET
 #define FLATTEN_IFRAME
 
-// not android specific, should be submitted back
-#define ANDROID_FASTER_MATRIX
-
 #define ANDROID_EXPOSE_COLUMN_GAP
 
 #define ANDROID_LAYOUT

WebCore/rendering/RenderLayer.cpp

diff --git a/WebCore/rendering/RenderLayer.cpp b/WebCore/rendering/RenderLayer.cpp
index e479fbf..6e51785 100644
--- a/WebCore/rendering/RenderLayer.cpp
+++ b/WebCore/rendering/RenderLayer.cpp
@@ -2230,14 +2230,8 @@
         int x = 0;
         int y = 0;
         convertToLayerCoords(rootLayer, x, y);
-#ifdef ANDROID_FASTER_MATRIX
         TransformationMatrix transform(layerTransform);
         transform.translateRight(x, y);
-#else
-        TransformationMatrix transform;
-        transform.translate(x, y);
-        transform = layerTransform * transform;
-#endif
         
         // Apply the transform.
         p->save();