WebKit merge 39606:39660

Review URL: http://codereview.chromium.org/17239

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7684 0039d316-1c4b-4281-b951-d872f2087c98

21 files changed, 107 insertions, 132 deletions

diff --git a/DEPS b/DEPS
index a27b92c..f9098cd 100644
--- a/DEPS
+++ b/DEPS
@@ -12,7 +12,7 @@ deps = {
     "http://googletest.googlecode.com/svn/trunk@167",
 
   "src/third_party/WebKit":
-    "/trunk/deps/third_party/WebKit@7634",
+    "/trunk/deps/third_party/WebKit@7677",
 
   "src/third_party/icu38":
     "/trunk/deps/third_party/icu38@7525",
@@ -21,13 +21,13 @@ deps = {
     "http://v8.googlecode.com/svn/trunk@1040",
 
   "src/webkit/data/layout_tests/LayoutTests":
-    "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39606",
+    "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39660",
 
   "src/third_party/WebKit/WebKit":
-    "http://svn.webkit.org/repository/webkit/trunk/WebKit@39606",
+    "http://svn.webkit.org/repository/webkit/trunk/WebKit@39660",
 
   "src/third_party/WebKit/WebKitLibraries":
-    "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39606",
+    "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39660",
 }
 
 
diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION
index 32f00da..1460394 100644
--- a/WEBKIT_MERGE_REVISION
+++ b/WEBKIT_MERGE_REVISION
@@ -1 +1 @@
-http://svn.webkit.org/repository/webkit/trunk@39606
\ No newline at end of file
+http://svn.webkit.org/repository/webkit/trunk@39660
\ No newline at end of file
diff --git a/webkit/build/JavaScriptCore/JavaScriptCore.vcproj b/webkit/build/JavaScriptCore/JavaScriptCore.vcproj
index cdde44d..f9fcfe2 100644
--- a/webkit/build/JavaScriptCore/JavaScriptCore.vcproj
+++ b/webkit/build/JavaScriptCore/JavaScriptCore.vcproj
@@ -181,6 +181,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ByteArray.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ByteArray.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\CallData.cpp"
 				>
 			</File>
@@ -405,6 +413,13 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSByteArray.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSByteArray.h"
+				>
+			<File
 				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSCell.cpp"
 				>
 			</File>
diff --git a/webkit/build/JavaScriptCore/WTF.vcproj b/webkit/build/JavaScriptCore/WTF.vcproj
index ec8b39f..4304610 100644
--- a/webkit/build/JavaScriptCore/WTF.vcproj
+++ b/webkit/build/JavaScriptCore/WTF.vcproj
@@ -138,6 +138,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ByteArray.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ByteArray.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\unicode\Collator.h"
 			>
 		</File>
diff --git a/webkit/build/KJSBindings/KJSBindings.vcproj b/webkit/build/KJSBindings/KJSBindings.vcproj
index 4c61b27..936d952a 100644
--- a/webkit/build/KJSBindings/KJSBindings.vcproj
+++ b/webkit/build/KJSBindings/KJSBindings.vcproj
@@ -173,14 +173,6 @@
 				>
 			</File>
 			<File
-				RelativePath="$(IntDir)\DerivedSources\JSCanvasPixelArray.cpp"
-				>
-			</File>
-			<File
-				RelativePath="$(IntDir)\DerivedSources\JSCanvasPixelArray.h"
-				>
-			</File>
-			<File
 				RelativePath="$(IntDir)\DerivedSources\JSCanvasRenderingContext2D.cpp"
 				>
 			</File>
diff --git a/webkit/build/V8Bindings/SConscript b/webkit/build/V8Bindings/SConscript
index e238757..e41ed63 100644
--- a/webkit/build/V8Bindings/SConscript
+++ b/webkit/build/V8Bindings/SConscript
@@ -53,7 +53,6 @@ inputs = [
     '$DERIVED_DIR/V8BarInfo.cpp',
     '$DERIVED_DIR/V8CanvasGradient.cpp',
     '$DERIVED_DIR/V8CanvasPattern.cpp',
-    '$DERIVED_DIR/V8CanvasPixelArray.cpp',
     '$DERIVED_DIR/V8CanvasRenderingContext2D.cpp',
     '$DERIVED_DIR/V8CDATASection.cpp',
     '$DERIVED_DIR/V8CharacterData.cpp',
diff --git a/webkit/build/V8Bindings/V8Bindings.vcproj b/webkit/build/V8Bindings/V8Bindings.vcproj
index 83aa56a..496f3dd 100644
--- a/webkit/build/V8Bindings/V8Bindings.vcproj
+++ b/webkit/build/V8Bindings/V8Bindings.vcproj
@@ -200,14 +200,6 @@
 				>
 			</File>
 			<File
-				RelativePath="$(IntDir)\DerivedSources\V8CanvasPixelArray.cpp"
-				>
-			</File>
-			<File
-				RelativePath="$(IntDir)\DerivedSources\V8CanvasPixelArray.h"
-				>
-			</File>
-			<File
 				RelativePath="$(IntDir)\DerivedSources\V8CanvasRenderingContext2D.cpp"
 				>
 			</File>
@@ -2521,11 +2513,11 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\port\bindings\v8\ScriptString.h"
+			RelativePath="..\..\port\bindings\v8\ScriptState.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\port\bindings\v8\ScriptState.h"
+			RelativePath="..\..\port\bindings\v8\ScriptString.h"
 			>
 		</File>
 		<File
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index d3d332b..336ea6f 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -225,7 +225,6 @@ input_files = [
 
     '$WEBCORE_DIR/html/CanvasGradient.cpp',
     '$WEBCORE_DIR/html/CanvasPattern.cpp',
-    '$WEBCORE_DIR/html/CanvasPixelArray.cpp',
     '$WEBCORE_DIR/html/CanvasRenderingContext2D.cpp',
     '$WEBCORE_DIR/html/CanvasStyle.cpp',
     '$WEBCORE_DIR/html/File.cpp',
@@ -494,8 +493,8 @@ input_files = [
     '$WEBCORE_DIR/platform/graphics/transforms/RotateTransformOperation.cpp',
     '$WEBCORE_DIR/platform/graphics/transforms/TransformOperations.cpp',
     '$WEBCORE_DIR/platform/graphics/transforms/MatrixTransformOperation.cpp',
-    '$WEBCORE_DIR/platform/graphics/transforms/AffineTransform.cpp',
     '$WEBCORE_DIR/platform/graphics/transforms/SkewTransformOperation.cpp',
+    '$WEBCORE_DIR/platform/graphics/transforms/TransformationMatrix.cpp',
 
     '$WEBCORE_DIR/platform/graphics/skia/AffineTransformSkia.cpp',
     '$WEBCORE_DIR/platform/graphics/skia/ColorSkia.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 1869613..5d91617 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -1472,14 +1472,6 @@
 					Name="transforms"
 					>
 					<File
-						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\AffineTransform.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\AffineTransform.h"
-						>
-					</File>
-					<File
 						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\IdentityTransformOperation.h"
 						>
 					</File>
@@ -1516,6 +1508,14 @@
 						>
 					</File>
 					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\TransformationMatrix.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\TransformationMatrix.h"
+						>
+					</File>
+					<File
 						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms\TransformOperation.h"
 						>
 					</File>
@@ -5126,14 +5126,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\html\CanvasPixelArray.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\html\CanvasPixelArray.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\html\CanvasRenderingContext2D.cpp"
 				>
 			</File>
diff --git a/webkit/build/port/SConscript b/webkit/build/port/SConscript
index b7e4c1d..b44313a 100644
--- a/webkit/build/port/SConscript
+++ b/webkit/build/port/SConscript
@@ -222,7 +222,6 @@ idl_files = [
     'dom/WheelEvent.idl',
 
     'html/CanvasGradient.idl',
-    'html/CanvasPixelArray.idl',
     'html/CanvasPattern.idl',
     'html/CanvasRenderingContext2D.idl',
     'html/File.idl',
diff --git a/webkit/glue/chrome_client_impl.h b/webkit/glue/chrome_client_impl.h
index 27fd2c7..af39a51 100644
--- a/webkit/glue/chrome_client_impl.h
+++ b/webkit/glue/chrome_client_impl.h
@@ -101,6 +101,7 @@ public:
   virtual WebCore::IntPoint screenToWindow(const WebCore::IntPoint&) const;
   virtual WebCore::IntRect windowToScreen(const WebCore::IntRect&) const;
   virtual PlatformWidget platformWindow() const;
+  virtual void contentsSizeChanged(WebCore::Frame*, const WebCore::IntSize&) const {}
 
   virtual void mouseDidMoveOverElement(const WebCore::HitTestResult& result,
                                        unsigned modifierFlags);
diff --git a/webkit/glue/webwidget_impl.h b/webkit/glue/webwidget_impl.h
index 246709b9..743473d 100644
--- a/webkit/glue/webwidget_impl.h
+++ b/webkit/glue/webwidget_impl.h
@@ -84,6 +84,7 @@ class WebWidgetImpl : public WebWidget,
   virtual WebCore::IntPoint screenToWindow(const WebCore::IntPoint&) const;
   virtual WebCore::IntRect windowToScreen(const WebCore::IntRect&) const;
   virtual PlatformWidget platformWindow() const;
+  virtual void contentsSizeChanged(WebCore::Frame*, const WebCore::IntSize&) const {}
 
   // WebCore::FramelessScrollViewClient methods:
   virtual void popupClosed(WebCore::FramelessScrollView* popup_view);
diff --git a/webkit/port/DerivedSources.make b/webkit/port/DerivedSources.make
index 598cfcb..cd1845f 100644
--- a/webkit/port/DerivedSources.make
+++ b/webkit/port/DerivedSources.make
@@ -635,7 +635,6 @@ all : \
     V8CSSValueList.h \
     V8CanvasGradient.h \
     V8CanvasPattern.h \
-    V8CanvasPixelArray.h \
     V8CanvasRenderingContext2D.h \
     V8CharacterData.h \
     V8Comment.h \
@@ -932,33 +931,30 @@ all : \
 
 # CSS property names and value keywords
 
-ifeq ($(findstring ENABLE_SVG,$(FEATURE_DEFINES)), ENABLE_SVG)
-
-CSSPropertyNames.h : css/CSSPropertyNames.in css/SVGCSSPropertyNames.in
-	if sort $< $(WebCore)/css/SVGCSSPropertyNames.in | uniq -d | grep -E '^[^#]'; then echo 'Duplicate value!'; exit 1; fi
-	cat $< $(WebCore)/css/SVGCSSPropertyNames.in > CSSPropertyNames.in
-	perl "$(WebCore)/css/makeprop.pl"
+WEBCORE_CSS_PROPERTY_NAMES := $(WebCore)/css/CSSPropertyNames.in
+WEBCORE_CSS_VALUE_KEYWORDS := $(WebCore)/css/CSSValueKeywords.in
 
-CSSValueKeywords.h : css/CSSValueKeywords.in css/SVGCSSValueKeywords.in
-	# Lower case all the values, as CSS values are case-insensitive
-	perl -ne 'print lc' $(WebCore)/css/SVGCSSValueKeywords.in > SVGCSSValueKeywords.in
-	if sort $< SVGCSSValueKeywords.in | uniq -d | grep -E '^[^#]'; then echo 'Duplicate value!'; exit 1; fi
-	cat $< SVGCSSValueKeywords.in > CSSValueKeywords.in
-	perl "$(WebCore)/css/makevalues.pl"
+ifeq ($(findstring ENABLE_SVG,$(FEATURE_DEFINES)), ENABLE_SVG)
+    WEBCORE_CSS_PROPERTY_NAMES := $(WEBCORE_CSS_PROPERTY_NAMES) $(WebCore)/css/SVGCSSPropertyNames.in
+    WEBCORE_CSS_VALUE_KEYWORDS := $(WEBCORE_CSS_VALUE_KEYWORDS) $(WebCore)/css/SVGCSSValueKeywords.in
+endif
 
-else
+# Chromium does not support this.
+#ifeq ($(ENABLE_DASHBOARD_SUPPORT), 1)
+#    WEBCORE_CSS_PROPERTY_NAMES := $(WEBCORE_CSS_PROPERTY_NAMES) $(WebCore)/css/DashboardSupportCSSPropertyNames.in
+#endif
 
-CSSPropertyNames.h : css/CSSPropertyNames.in css/makeprop.pl
-	cp $< CSSPropertyNames.in
+CSSPropertyNames.h : $(WEBCORE_CSS_PROPERTY_NAMES) css/makeprop.pl
+	if sort $(WEBCORE_CSS_PROPERTY_NAMES) | uniq -d | grep -E '^[^#]'; then echo 'Duplicate value!'; exit 1; fi
+	cat $(WEBCORE_CSS_PROPERTY_NAMES) > CSSPropertyNames.in
 	perl "$(WebCore)/css/makeprop.pl"
 
-CSSValueKeywords.h : css/CSSValueKeywords.in css/makevalues.pl
-	cp $< CSSValueKeywords.in
+CSSValueKeywords.h : $(WEBCORE_CSS_VALUE_KEYWORDS) css/makevalues.pl
+	# Lower case all the values, as CSS values are case-insensitive
+	perl -ne 'print lc' $(WEBCORE_CSS_VALUE_KEYWORDS) > CSSValueKeywords.in
+	if sort CSSValueKeywords.in | uniq -d | grep -E '^[^#]'; then echo 'Duplicate value!'; exit 1; fi
 	perl "$(WebCore)/css/makevalues.pl"
 
-endif 
-
-
 # DOCTYPE strings
 
 DocTypeStrings.cpp : html/DocTypeStrings.gperf
diff --git a/webkit/port/bindings/scripts/CodeGeneratorV8.pm b/webkit/port/bindings/scripts/CodeGeneratorV8.pm
index 0b3b277..779ac9d 100644
--- a/webkit/port/bindings/scripts/CodeGeneratorV8.pm
+++ b/webkit/port/bindings/scripts/CodeGeneratorV8.pm
@@ -1611,7 +1611,7 @@ sub GetNativeType
     return "Range::CompareHow" if $type eq "CompareHow";
     return "FloatRect" if $type eq "SVGRect";
     return "FloatPoint" if $type eq "SVGPoint";
-    return "AffineTransform" if $type eq "SVGMatrix";
+    return "TransformationMatrix" if $type eq "SVGMatrix";
     return "SVGTransform" if $type eq "SVGTransform";
     return "SVGLength" if $type eq "SVGLength";
     return "double" if $type eq "SVGNumber";
diff --git a/webkit/port/bindings/v8/v8_custom.cpp b/webkit/port/bindings/v8/v8_custom.cpp
index 30dbf2e..5c75ea7 100644
--- a/webkit/port/bindings/v8/v8_custom.cpp
+++ b/webkit/port/bindings/v8/v8_custom.cpp
@@ -49,7 +49,6 @@
 #include "Base64.h"
 #include "CanvasGradient.h"
 #include "CanvasPattern.h"
-#include "CanvasPixelArray.h"
 #include "CanvasRenderingContext2D.h"
 #include "CanvasStyle.h"
 #include "Clipboard.h"
@@ -686,34 +685,6 @@ NAMED_PROPERTY_GETTER(HTMLCollection) {
   return HTMLCollectionGetNamedItems(imp, key);
 }
 
-INDEXED_PROPERTY_GETTER(CanvasPixelArray) {
-  INC_STATS("DOM.CanvasPixelArray.IndexedPropertyGetter");
-  CanvasPixelArray* pixelArray =
-      V8Proxy::ToNativeObject<CanvasPixelArray>(V8ClassIndex::CANVASPIXELARRAY,
-          info.Holder());
-
-  // TODO(eroman): This performance will not be good when looping through
-  // many pixels. See: http://code.google.com/p/chromium/issues/detail?id=3473
-  
-  unsigned char result;
-  if (!pixelArray->get(index, result))
-      return v8::Undefined();
-  return v8::Number::New(result);
-}
-
-INDEXED_PROPERTY_SETTER(CanvasPixelArray) {
-  INC_STATS("DOM.CanvasPixelArray.IndexedPropertySetter");
-  CanvasPixelArray* pixelArray =
-      V8Proxy::ToNativeObject<CanvasPixelArray>(V8ClassIndex::CANVASPIXELARRAY,
-          info.Holder());
-
-  double pixelValue = value->NumberValue();
-  pixelArray->set(index, pixelValue);
-
-  // TODO(eroman): what to return?
-  return v8::Undefined();
-}
-
 CALLBACK_FUNC_DECL(HTMLCollectionItem) {
   INC_STATS("DOM.HTMLCollection.item()");
   HTMLCollection* imp = V8Proxy::ToNativeObject<HTMLCollection>(
@@ -3290,11 +3261,11 @@ CALLBACK_FUNC_DECL(SVGLengthConvertToSpecifiedUnits) {
 
 CALLBACK_FUNC_DECL(SVGMatrixInverse) {
   INC_STATS("DOM.SVGMatrix.inverse()");
-  AffineTransform imp =
-      *V8Proxy::ToNativeObject<V8SVGPODTypeWrapper<AffineTransform> >(
+  TransformationMatrix imp =
+      *V8Proxy::ToNativeObject<V8SVGPODTypeWrapper<TransformationMatrix> >(
           V8ClassIndex::SVGMATRIX, args.Holder());
   ExceptionCode ec = 0;
-  AffineTransform result = imp.inverse();
+  TransformationMatrix result = imp.inverse();
   if (!imp.isInvertible()) {
     ec = SVGException::SVG_MATRIX_NOT_INVERTABLE;
   }
@@ -3304,18 +3275,18 @@ CALLBACK_FUNC_DECL(SVGMatrixInverse) {
   }
 
   return V8Proxy::ToV8Object(V8ClassIndex::SVGMATRIX,
-      new V8SVGStaticPODTypeWrapper<AffineTransform>(result));
+      new V8SVGStaticPODTypeWrapper<TransformationMatrix>(result));
 }
 
 CALLBACK_FUNC_DECL(SVGMatrixRotateFromVector) {
   INC_STATS("DOM.SVGMatrix.rotateFromVector()");
-  AffineTransform imp =
-      *V8Proxy::ToNativeObject<V8SVGPODTypeWrapper<AffineTransform> >(
+  TransformationMatrix imp =
+      *V8Proxy::ToNativeObject<V8SVGPODTypeWrapper<TransformationMatrix> >(
           V8ClassIndex::SVGMATRIX, args.Holder());
   ExceptionCode ec = 0;
   float x = TO_FLOAT(args[0]);
   float y = TO_FLOAT(args[1]);
-  AffineTransform result = imp;
+  TransformationMatrix result = imp;
   result.rotateFromVector(x, y);
   if (x == 0.0 || y == 0.0) {
     ec = SVGException::SVG_INVALID_VALUE_ERR;
@@ -3326,7 +3297,7 @@ CALLBACK_FUNC_DECL(SVGMatrixRotateFromVector) {
   }
 
   return V8Proxy::ToV8Object(V8ClassIndex::SVGMATRIX,
-      new V8SVGStaticPODTypeWrapper<AffineTransform>(result));
+      new V8SVGStaticPODTypeWrapper<TransformationMatrix>(result));
 }
 
 CALLBACK_FUNC_DECL(SVGElementInstanceAddEventListener) {
diff --git a/webkit/port/bindings/v8/v8_custom.h b/webkit/port/bindings/v8/v8_custom.h
index ce7bd03..a2555bc 100644
--- a/webkit/port/bindings/v8/v8_custom.h
+++ b/webkit/port/bindings/v8/v8_custom.h
@@ -369,9 +369,6 @@ DECLARE_INDEXED_PROPERTY_SETTER(HTMLOptionsCollection)
 DECLARE_INDEXED_PROPERTY_SETTER(HTMLSelectElementCollection)
 DECLARE_NAMED_PROPERTY_GETTER(HTMLCollection)
 
-DECLARE_INDEXED_PROPERTY_GETTER(CanvasPixelArray)
-DECLARE_INDEXED_PROPERTY_SETTER(CanvasPixelArray)
-
 // MessagePort
 DECLARE_PROPERTY_ACCESSOR(MessagePortOnmessage)
 DECLARE_PROPERTY_ACCESSOR(MessagePortOnclose)
diff --git a/webkit/port/bindings/v8/v8_index.cpp b/webkit/port/bindings/v8/v8_index.cpp
index 8909b76..5da9c23 100644
--- a/webkit/port/bindings/v8/v8_index.cpp
+++ b/webkit/port/bindings/v8/v8_index.cpp
@@ -38,7 +38,6 @@
 #include "V8CanvasRenderingContext2D.h"
 #include "V8CanvasGradient.h"
 #include "V8CanvasPattern.h"
-#include "V8CanvasPixelArray.h"
 #include "V8CDATASection.h"
 #include "V8CharacterData.h"
 #include "V8Clipboard.h"
diff --git a/webkit/port/bindings/v8/v8_index.h b/webkit/port/bindings/v8/v8_index.h
index 7122c56..13337d3 100644
--- a/webkit/port/bindings/v8/v8_index.h
+++ b/webkit/port/bindings/v8/v8_index.h
@@ -234,7 +234,6 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)();
   V(BARINFO, BarInfo)                                                   \
   V(CANVASGRADIENT, CanvasGradient)                                     \
   V(CANVASPATTERN, CanvasPattern)                                       \
-  V(CANVASPIXELARRAY, CanvasPixelArray)                                 \
   V(CANVASRENDERINGCONTEXT2D, CanvasRenderingContext2D)                 \
   V(CLIPBOARD, Clipboard)                                               \
   V(CONSOLE, Console)                                                   \
@@ -390,7 +389,7 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)();
 #define SVG_POD_NATIVE_TYPES(V)                                         \
   V(SVGLENGTH, SVGLength)                                               \
   V(SVGTRANSFORM, SVGTransform)                                         \
-  V(SVGMATRIX, AffineTransform)                                         \
+  V(SVGMATRIX, TransformationMatrix)                                    \
   V(SVGNUMBER, float)                                                   \
   V(SVGPOINT, FloatPoint)                                               \
   V(SVGRECT, FloatRect)
diff --git a/webkit/port/bindings/v8/v8_proxy.cpp b/webkit/port/bindings/v8/v8_proxy.cpp
index dd46d2b..b040809 100644
--- a/webkit/port/bindings/v8/v8_proxy.cpp
+++ b/webkit/port/bindings/v8/v8_proxy.cpp
@@ -50,7 +50,6 @@
 #include "BarInfo.h"
 #include "CanvasGradient.h"
 #include "CanvasPattern.h"
-#include "CanvasPixelArray.h"
 #include "CanvasRenderingContext2D.h"
 #include "CanvasStyle.h"
 #include "CharacterData.h"
@@ -1658,11 +1657,6 @@ v8::Persistent<v8::FunctionTemplate> V8Proxy::GetTemplate(
           NodeCollectionIndexedPropertyEnumerator<HTMLFormElement>,
           v8::Integer::New(V8ClassIndex::NODE));
       break;
-    case V8ClassIndex::CANVASPIXELARRAY:
-      desc->InstanceTemplate()->SetIndexedPropertyHandler(
-          USE_INDEXED_PROPERTY_GETTER(CanvasPixelArray),
-          USE_INDEXED_PROPERTY_SETTER(CanvasPixelArray));
-      break;
     case V8ClassIndex::STYLESHEET:  // fall through
     case V8ClassIndex::CSSSTYLESHEET: {
       // We add an extra internal field to hold a reference to
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index eb33152..79b33d2 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1847,3 +1847,36 @@ WIN DEBUG : LayoutTests/editing/execCommand/paste-2.html = PASS FAIL
 MAC WIN : LayoutTests/fast/canvas/set-colors.html = FAIL
 // Crashes on the buildbot reliably(?) but not locally, even under Valgrind.
 LINUX : LayoutTests/fast/canvas/set-colors.html = FAIL CRASH
+
+// Merge 39606:39660 - these tests fail now because inageData.data 
+// returns 'undefined'. Upstream change removed the CanvasPixelArray 
+// and this property should be implemented anew now. 
+// See http://trac.webkit.org/changeset/39625
+LayoutTests/fast/canvas/canvas-ImageData-behaviour.html = FAIL
+LayoutTests/fast/canvas/canvas-alphaImageData-behavior.html = FAIL
+LayoutTests/fast/canvas/canvas-gradient-without-path.html = FAIL
+LayoutTests/fast/canvas/canvas-invalid-fillstyle.html = FAIL
+LayoutTests/fast/canvas/canvas-invalid-strokestyle.html = FAIL
+LayoutTests/fast/canvas/canvas-longlived-context.html = FAIL
+LayoutTests/fast/canvas/canvas-path-with-inf-nan-dimensions.html = FAIL
+LayoutTests/fast/canvas/canvas-pattern-behaviour.html = FAIL
+LayoutTests/fast/canvas/canvas-putImageData.html = FAIL
+LayoutTests/fast/canvas/canvas-radial-gradient-spreadMethod.html = FAIL
+LayoutTests/fast/canvas/canvas-save-restore-with-path.html = FAIL
+LayoutTests/fast/canvas/canvas-set-properties-with-non-invertible-ctm.html = FAIL
+LayoutTests/fast/canvas/canvas-setTransform.html = FAIL
+LayoutTests/fast/canvas/canvas-stroke-empty-fill.html = FAIL
+LayoutTests/fast/canvas/canvas-strokeRect.html = FAIL
+LayoutTests/fast/canvas/canvas-transparency-and-composite.html = FAIL
+LayoutTests/fast/canvas/drawImage-with-negative-source-destination.html = FAIL
+LayoutTests/fast/canvas/gradient-with-clip.html = FAIL
+LayoutTests/fast/canvas/pattern-with-transform.html = FAIL
+
+// Merge 39606:39660 - tests were modified upstream, perhaps need a rebaseline.
+LayoutTests/svg/custom/pointer-events-path.svg = FAIL
+LayoutTests/svg/custom/pointer-events-text.svg = FAIL
+
+// Merge 39606:39660 - new tests
+SKIP : LayoutTests/fast/events/pointer-events-2.html = FAIL
+SKIP : LayoutTests/fast/events/pointer-events.html = FAIL
+
diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj
index 6b57735..4d40b94 100644
--- a/webkit/webkit.xcodeproj/project.pbxproj
+++ b/webkit/webkit.xcodeproj/project.pbxproj
@@ -49,7 +49,7 @@
 		4103039F0EFB0F7C008832CA /* CachedPage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4103039E0EFB0F7C008832CA /* CachedPage.cpp */; };
 		4112E7060EFB0A26001E0E7A /* RandomNumber.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4112E7050EFB0A26001E0E7A /* RandomNumber.cpp */; };
 		416F45220ED7697D008215B6 /* FrameLoaderClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 416F45210ED7697D008215B6 /* FrameLoaderClient.cpp */; };
-		41822AF50F0000B70034A67A /* AffineTransform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3CBAF5F10EFC893600E752CB /* AffineTransform.cpp */; };
+		41822AF50F0000B70034A67A /* TransformationMatrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3CBAF5F10EFC893600E752CB /* TransformationMatrix.cpp */; };
 		41822B020F0000D30034A67A /* AnimationList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3CBAF5ED0EFC892100E752CB /* AnimationList.cpp */; };
 		41822B030F0000D80034A67A /* Animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3CBAF5EB0EFC892100E752CB /* Animation.cpp */; };
 		41822B050F0000E40034A67A /* MatrixTransformOperation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3CBAF5F40EFC893600E752CB /* MatrixTransformOperation.cpp */; };
@@ -115,7 +115,6 @@
 		4DB299C80EA4DD1E007EA4CF /* V8XMLHttpRequestProgressEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DB299C30EA4DD1E007EA4CF /* V8XMLHttpRequestProgressEvent.cpp */; };
 		4DB7EF7B0E9B9F0200C66CE0 /* V8CSSVariablesDeclaration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DB7EF770E9B9F0200C66CE0 /* V8CSSVariablesDeclaration.cpp */; };
 		4DB7EF7C0E9B9F0200C66CE0 /* V8CSSVariablesRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DB7EF790E9B9F0200C66CE0 /* V8CSSVariablesRule.cpp */; };
-		4DB7EF920E9B9F6300C66CE0 /* V8CanvasPixelArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DB7EF800E9B9F6300C66CE0 /* V8CanvasPixelArray.cpp */; };
 		4DB7EF930E9B9F6300C66CE0 /* V8File.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DB7EF820E9B9F6300C66CE0 /* V8File.cpp */; };
 		4DB7EF940E9B9F6300C66CE0 /* V8FileList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DB7EF840E9B9F6300C66CE0 /* V8FileList.cpp */; };
 		4DB7EF950E9B9F6300C66CE0 /* V8ImageData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DB7EF860E9B9F6300C66CE0 /* V8ImageData.cpp */; };
@@ -146,7 +145,6 @@
 		4DB7F0090E9BA3A100C66CE0 /* GeneratedImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DB7EFFE0E9BA3A100C66CE0 /* GeneratedImage.cpp */; };
 		4DB7F00A0E9BA3A100C66CE0 /* Gradient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DB7F0010E9BA3A100C66CE0 /* Gradient.cpp */; };
 		4DB7F00B0E9BA3A100C66CE0 /* Pattern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DB7F0040E9BA3A100C66CE0 /* Pattern.cpp */; };
-		4DB7F0590E9BA86A00C66CE0 /* CanvasPixelArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DB7F04B0E9BA86A00C66CE0 /* CanvasPixelArray.cpp */; };
 		4DB7F05A0E9BA86A00C66CE0 /* File.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DB7F04D0E9BA86A00C66CE0 /* File.cpp */; };
 		4DB7F05B0E9BA86A00C66CE0 /* FileList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DB7F04F0E9BA86A00C66CE0 /* FileList.cpp */; };
 		4DB7F05C0E9BA86A00C66CE0 /* HTMLAnchorElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DB7F0510E9BA86A00C66CE0 /* HTMLAnchorElement.cpp */; };
@@ -1455,8 +1453,8 @@
 		3CBAF5ED0EFC892100E752CB /* AnimationList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AnimationList.cpp; sourceTree = "<group>"; };
 		3CBAF5EE0EFC892100E752CB /* AnimationList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnimationList.h; sourceTree = "<group>"; };
 		3CBAF5EF0EFC892100E752CB /* TimingFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimingFunction.h; sourceTree = "<group>"; };
-		3CBAF5F10EFC893600E752CB /* AffineTransform.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AffineTransform.cpp; sourceTree = "<group>"; };
-		3CBAF5F20EFC893600E752CB /* AffineTransform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AffineTransform.h; sourceTree = "<group>"; };
+		3CBAF5F10EFC893600E752CB /* TransformationMatrix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TransformationMatrix.cpp; sourceTree = "<group>"; };
+		3CBAF5F20EFC893600E752CB /* TransformationMatrix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransformationMatrix.h; sourceTree = "<group>"; };
 		3CBAF5F30EFC893600E752CB /* IdentityTransformOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IdentityTransformOperation.h; sourceTree = "<group>"; };
 		3CBAF5F40EFC893600E752CB /* MatrixTransformOperation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MatrixTransformOperation.cpp; sourceTree = "<group>"; };
 		3CBAF5F50EFC893600E752CB /* MatrixTransformOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MatrixTransformOperation.h; sourceTree = "<group>"; };
@@ -1631,8 +1629,6 @@
 		4DB7EF780E9B9F0200C66CE0 /* V8CSSVariablesDeclaration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = V8CSSVariablesDeclaration.h; sourceTree = "<group>"; };
 		4DB7EF790E9B9F0200C66CE0 /* V8CSSVariablesRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = V8CSSVariablesRule.cpp; sourceTree = "<group>"; };
 		4DB7EF7A0E9B9F0200C66CE0 /* V8CSSVariablesRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = V8CSSVariablesRule.h; sourceTree = "<group>"; };
-		4DB7EF800E9B9F6300C66CE0 /* V8CanvasPixelArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = V8CanvasPixelArray.cpp; sourceTree = "<group>"; };
-		4DB7EF810E9B9F6300C66CE0 /* V8CanvasPixelArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = V8CanvasPixelArray.h; sourceTree = "<group>"; };
 		4DB7EF820E9B9F6300C66CE0 /* V8File.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = V8File.cpp; sourceTree = "<group>"; };
 		4DB7EF830E9B9F6300C66CE0 /* V8File.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = V8File.h; sourceTree = "<group>"; };
 		4DB7EF840E9B9F6300C66CE0 /* V8FileList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = V8FileList.cpp; sourceTree = "<group>"; };
@@ -1700,8 +1696,6 @@
 		4DB7F0050E9BA3A100C66CE0 /* Pattern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Pattern.h; sourceTree = "<group>"; };
 		4DB7F0060E9BA3A100C66CE0 /* TextRun.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextRun.h; sourceTree = "<group>"; };
 		4DB7F0070E9BA3A100C66CE0 /* UnitBezier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnitBezier.h; sourceTree = "<group>"; };
-		4DB7F04B0E9BA86A00C66CE0 /* CanvasPixelArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CanvasPixelArray.cpp; sourceTree = "<group>"; };
-		4DB7F04C0E9BA86A00C66CE0 /* CanvasPixelArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CanvasPixelArray.h; sourceTree = "<group>"; };
 		4DB7F04D0E9BA86A00C66CE0 /* File.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = File.cpp; sourceTree = "<group>"; };
 		4DB7F04E0E9BA86A00C66CE0 /* File.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = File.h; sourceTree = "<group>"; };
 		4DB7F04F0E9BA86A00C66CE0 /* FileList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileList.cpp; sourceTree = "<group>"; };
@@ -4357,8 +4351,8 @@
 		3CBAF5F00EFC893600E752CB /* transforms */ = {
 			isa = PBXGroup;
 			children = (
-				3CBAF5F10EFC893600E752CB /* AffineTransform.cpp */,
-				3CBAF5F20EFC893600E752CB /* AffineTransform.h */,
+				3CBAF5F10EFC893600E752CB /* TransformationMatrix.cpp */,
+				3CBAF5F20EFC893600E752CB /* TransformationMatrix.h */,
 				3CBAF5F30EFC893600E752CB /* IdentityTransformOperation.h */,
 				3CBAF5F40EFC893600E752CB /* MatrixTransformOperation.cpp */,
 				3CBAF5F50EFC893600E752CB /* MatrixTransformOperation.h */,
@@ -5238,8 +5232,6 @@
 				7B5E8BE40D7F3B62001ECF42 /* CanvasGradient.h */,
 				7B5E8BE60D7F3B62001ECF42 /* CanvasPattern.cpp */,
 				7B5E8BE70D7F3B62001ECF42 /* CanvasPattern.h */,
-				4DB7F04B0E9BA86A00C66CE0 /* CanvasPixelArray.cpp */,
-				4DB7F04C0E9BA86A00C66CE0 /* CanvasPixelArray.h */,
 				7B5E8BEA0D7F3B62001ECF42 /* CanvasRenderingContext2D.cpp */,
 				7B5E8BEB0D7F3B62001ECF42 /* CanvasRenderingContext2D.h */,
 				7B5E8BED0D7F3B62001ECF42 /* CanvasStyle.cpp */,
@@ -6812,8 +6804,6 @@
 				7B0091440DAFEFE200F72082 /* V8CanvasGradient.h */,
 				7B0091450DAFEFE300F72082 /* V8CanvasPattern.cpp */,
 				7B0091460DAFEFE300F72082 /* V8CanvasPattern.h */,
-				4DB7EF800E9B9F6300C66CE0 /* V8CanvasPixelArray.cpp */,
-				4DB7EF810E9B9F6300C66CE0 /* V8CanvasPixelArray.h */,
 				7B0091470DAFEFE300F72082 /* V8CanvasRenderingContext2D.cpp */,
 				7B0091480DAFEFE300F72082 /* V8CanvasRenderingContext2D.h */,
 				7B0091490DAFEFE300F72082 /* V8CDATASection.cpp */,
@@ -8198,7 +8188,6 @@
 				7B0093830DAFEFE600F72082 /* V8BarInfo.cpp in Sources */,
 				7B0093850DAFEFE600F72082 /* V8CanvasGradient.cpp in Sources */,
 				7B0093870DAFEFE600F72082 /* V8CanvasPattern.cpp in Sources */,
-				4DB7EF920E9B9F6300C66CE0 /* V8CanvasPixelArray.cpp in Sources */,
 				7B0093890DAFEFE600F72082 /* V8CanvasRenderingContext2D.cpp in Sources */,
 				7B00938B0DAFEFE600F72082 /* V8CDATASection.cpp in Sources */,
 				7B00938D0DAFEFE600F72082 /* V8CharacterData.cpp in Sources */,
@@ -8495,7 +8484,7 @@
 				4DB7F2040E9BAE2900C66CE0 /* AccessibilityTableHeaderContainer.cpp in Sources */,
 				4DB7F2050E9BAE2900C66CE0 /* AccessibilityTableRow.cpp in Sources */,
 				4D1641310EC29E80008F024E /* ActiveDOMObject.cpp in Sources */,
-				41822AF50F0000B70034A67A /* AffineTransform.cpp in Sources */,
+				41822AF50F0000B70034A67A /* TransformationMatrix.cpp in Sources */,
 				E45626810E268E87005E4685 /* AffineTransformCG.cpp in Sources */,
 				41822B030F0000D80034A67A /* Animation.cpp in Sources */,
 				4DB7EFE50E9BA1E400C66CE0 /* AnimationBase.cpp in Sources */,
@@ -8540,7 +8529,6 @@
 				E45624830E268E87005E4685 /* CachedXSLStyleSheet.cpp in Sources */,
 				E45624210E268E87005E4685 /* CanvasGradient.cpp in Sources */,
 				E45624220E268E87005E4685 /* CanvasPattern.cpp in Sources */,
-				4DB7F0590E9BA86A00C66CE0 /* CanvasPixelArray.cpp in Sources */,
 				E45624230E268E87005E4685 /* CanvasRenderingContext2D.cpp in Sources */,
 				E45624240E268E87005E4685 /* CanvasStyle.cpp in Sources */,
 				E45623B00E268E87005E4685 /* CDATASection.cpp in Sources */,