webkit merge 41217:41268, Chromium part

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

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

13 files changed, 75 insertions, 24 deletions

diff --git a/webkit/build/V8Bindings/SConscript b/webkit/build/V8Bindings/SConscript
index 7f5451a7..9e444985 100644
--- a/webkit/build/V8Bindings/SConscript
+++ b/webkit/build/V8Bindings/SConscript
@@ -307,6 +307,7 @@ inputs = [
     '$DERIVED_DIR/V8WebKitCSSKeyframesRule.cpp',
     '$DERIVED_DIR/V8WebKitCSSMatrix.cpp',
     '$DERIVED_DIR/V8WebKitCSSTransformValue.cpp',
+    '$DERIVED_DIR/V8WebKitPoint.cpp',
     '$DERIVED_DIR/V8WebKitTransitionEvent.cpp',
     '$DERIVED_DIR/V8WheelEvent.cpp',
     '$DERIVED_DIR/V8Worker.cpp',
diff --git a/webkit/build/V8Bindings/V8Bindings.vcproj b/webkit/build/V8Bindings/V8Bindings.vcproj
index 6b21b54..ae90fac 100644
--- a/webkit/build/V8Bindings/V8Bindings.vcproj
+++ b/webkit/build/V8Bindings/V8Bindings.vcproj
@@ -2340,6 +2340,14 @@
 				>
 			</File>
 			<File
+				RelativePath="$(IntDir)\DerivedSources\V8WebKitPoint.cpp"
+				>
+			</File>
+			<File
+				RelativePath="$(IntDir)\DerivedSources\V8WebKitPoint.h"
+				>
+			</File>
+			<File
 				RelativePath="$(IntDir)\DerivedSources\V8WebKitTransitionEvent.cpp"
 				>
 			</File>
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 4e70e3c..c719575 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -481,6 +481,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\page\WebKitPoint.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\page\WindowFeatures.cpp"
 				>
 			</File>
@@ -7242,10 +7246,6 @@
 						RelativePath="..\..\..\third_party\WebKit\WebCore\svg\graphics\skia\SVGResourceFilterSkia.cpp"
 						>
 					</File>
-					<File
-						RelativePath="..\..\..\third_party\WebKit\WebCore\svg\graphics\skia\SVGResourceMaskerSkia.cpp"
-						>
-					</File>
 				</Filter>
 			</Filter>
 			<Filter
diff --git a/webkit/build/port/SConscript b/webkit/build/port/SConscript
index 1d739d7..d05093e 100644
--- a/webkit/build/port/SConscript
+++ b/webkit/build/port/SConscript
@@ -311,6 +311,7 @@ idl_files = [
     'page/Location.idl',
     'page/Navigator.idl',
     'page/Screen.idl',
+    'page/WebKitPoint.idl',
     'page/WorkerNavigator.idl',
 
     'inspector/InspectorController.idl',
diff --git a/webkit/port/DerivedSources.make b/webkit/port/DerivedSources.make
index 741b9c1..de46e40 100644
--- a/webkit/port/DerivedSources.make
+++ b/webkit/port/DerivedSources.make
@@ -900,6 +900,7 @@ all : \
     V8WebKitCSSKeyframesRule.h \
     V8WebKitCSSMatrix.h \
     V8WebKitCSSTransformValue.h \
+    V8WebKitPoint.h \
     V8WebKitTransitionEvent.h \
     V8WheelEvent.h \
     V8Worker.h \
diff --git a/webkit/port/bindings/scripts/CodeGeneratorV8.pm b/webkit/port/bindings/scripts/CodeGeneratorV8.pm
index afd977c..71d33ad 100644
--- a/webkit/port/bindings/scripts/CodeGeneratorV8.pm
+++ b/webkit/port/bindings/scripts/CodeGeneratorV8.pm
@@ -1619,6 +1619,7 @@ sub IsRefPtrType
     return 1 if $type eq "TimeRanges";
     return 1 if $type eq "TreeWalker";
     return 1 if $type eq "WebKitCSSMatrix";
+    return 1 if $type eq "WebKitPoint";
     return 1 if $type eq "XPathExpression";
     return 1 if $type eq "XPathNSResolver";
     return 1 if $type eq "XPathResult";
@@ -1726,6 +1727,7 @@ my %typeCanFailConversion = (
     "SVGTransform" => 0,
     "VoidCallback" => 1,
     "WebKitCSSMatrix" => 0,
+    "WebKitPoint" => 0,
     "XPathEvaluator" => 0,
     "XPathNSResolver" => 0,
     "XPathResult" => 0,
diff --git a/webkit/port/bindings/v8/v8_custom.cpp b/webkit/port/bindings/v8/v8_custom.cpp
index 6d05406..23bd5e9b 100644
--- a/webkit/port/bindings/v8/v8_custom.cpp
+++ b/webkit/port/bindings/v8/v8_custom.cpp
@@ -103,6 +103,7 @@
 #include "StyleSheetList.h"
 #include "TreeWalker.h"
 #include "WebKitCSSMatrix.h"
+#include "WebKitPoint.h"
 #include "XMLSerializer.h"
 #include "XPathEvaluator.h"
 #include "XPathResult.h"
@@ -288,6 +289,11 @@ CALLBACK_FUNC_DECL(WebKitCSSMatrixConstructor) {
   return args.Holder();
 }
 
+CALLBACK_FUNC_DECL(WebKitPointConstructor) {
+  INC_STATS("DOM.WebKitPoint.Constructor");
+  return V8Proxy::ConstructDOMObject<V8ClassIndex::WEBKITPOINT,
+                                     WebKitPoint>(args);
+}
 
 CALLBACK_FUNC_DECL(XMLSerializerConstructor) {
   INC_STATS("DOM.XMLSerializer.Constructor");
diff --git a/webkit/port/bindings/v8/v8_custom.h b/webkit/port/bindings/v8/v8_custom.h
index 5ec3e98..2afbfc8 100644
--- a/webkit/port/bindings/v8/v8_custom.h
+++ b/webkit/port/bindings/v8/v8_custom.h
@@ -294,6 +294,7 @@ DECLARE_CALLBACK(DOMWindowClearInterval)
 DECLARE_CALLBACK(DOMParserConstructor)
 DECLARE_CALLBACK(MessageChannelConstructor)
 DECLARE_CALLBACK(WebKitCSSMatrixConstructor)
+DECLARE_CALLBACK(WebKitPointConstructor)
 DECLARE_CALLBACK(XMLHttpRequestConstructor)
 DECLARE_CALLBACK(XMLSerializerConstructor)
 DECLARE_CALLBACK(XPathEvaluatorConstructor)
diff --git a/webkit/port/bindings/v8/v8_index.cpp b/webkit/port/bindings/v8/v8_index.cpp
index a82479a..bf6225c 100644
--- a/webkit/port/bindings/v8/v8_index.cpp
+++ b/webkit/port/bindings/v8/v8_index.cpp
@@ -162,6 +162,7 @@
 #include "V8WebKitCSSKeyframesRule.h"
 #include "V8WebKitCSSMatrix.h"
 #include "V8WebKitCSSTransformValue.h"
+#include "V8WebKitPoint.h"
 #include "V8WebKitTransitionEvent.h"
 #include "V8WheelEvent.h"
 #include "V8UIEvent.h"
diff --git a/webkit/port/bindings/v8/v8_index.h b/webkit/port/bindings/v8/v8_index.h
index 1d5db7f..f52f984 100644
--- a/webkit/port/bindings/v8/v8_index.h
+++ b/webkit/port/bindings/v8/v8_index.h
@@ -316,6 +316,7 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)();
   V(WEBKITCSSKEYFRAMERULE, WebKitCSSKeyframeRule)                       \
   V(WEBKITCSSKEYFRAMESRULE, WebKitCSSKeyframesRule)                     \
   V(WEBKITCSSMATRIX, WebKitCSSMatrix)                                   \
+  V(WEBKITPOINT, WebKitPoint)                                           \
   V(WEBKITCSSTRANSFORMVALUE, WebKitCSSTransformValue)                   \
   V(WEBKITTRANSITIONEVENT, WebKitTransitionEvent)                       \
   V(WHEELEVENT, WheelEvent)                                             \
diff --git a/webkit/port/bindings/v8/v8_proxy.cpp b/webkit/port/bindings/v8/v8_proxy.cpp
index 010b2a6d..56f62e6 100644
--- a/webkit/port/bindings/v8/v8_proxy.cpp
+++ b/webkit/port/bindings/v8/v8_proxy.cpp
@@ -150,6 +150,7 @@
 #include "WebKitCSSKeyframesRule.h"
 #include "WebKitCSSMatrix.h"
 #include "WebKitCSSTransformValue.h"
+#include "WebKitPoint.h"
 #include "WebKitTransitionEvent.h"
 #include "WheelEvent.h"
 #include "XMLHttpRequestProgressEvent.h"
@@ -1843,6 +1844,9 @@ v8::Persistent<v8::FunctionTemplate> V8Proxy::GetTemplate(
     case V8ClassIndex::WEBKITCSSMATRIX:
       desc->SetCallHandler(USE_CALLBACK(WebKitCSSMatrixConstructor));
       break;
+    case V8ClassIndex::WEBKITPOINT:
+      desc->SetCallHandler(USE_CALLBACK(WebKitPointConstructor));
+      break;
     case V8ClassIndex::XMLSERIALIZER:
       desc->SetCallHandler(USE_CALLBACK(XMLSerializerConstructor));
       break;
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 10564dd..24c87a0 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -60,6 +60,7 @@ DEFER LINUX WIN : LayoutTests/css2.1/t1202-counters-04-b.html = FAIL
 
 // Bug 1124513: the max length is being applied correctly, but the over- and
 // under-lines aren't placed properly over the "x".
+// Can defer this test once the crash is fixed.
 DEFER : LayoutTests/fast/forms/input-text-maxlength.html = FAIL
 DEFER : LayoutTests/fast/forms/input-text-paste-maxlength.html = FAIL
 
@@ -316,13 +317,6 @@ DEFER WIN LINUX : LayoutTests/fast/inline/dirtyLinesForInline.html = PASS FAIL
 LINUX : chrome/fast/forms/basic-textareas.html = FAIL
 LINUX : chrome/fast/forms/basic-textareas-quirks.html = FAIL
 LINUX MAC : LayoutTests/editing/selection/5354455-1.html = FAIL
-LINUX : LayoutTests/editing/selection/select-all-iframe.html = FAIL
-LINUX : LayoutTests/fast/lists/list-marker-with-line-height.html = FAIL
-LINUX : LayoutTests/fast/overflow/overflow-stacking.html = FAIL
-LINUX : LayoutTests/fast/overflow/overflow-float-stacking.html = FAIL
-LINUX : LayoutTests/fast/replaced/embed-display-none.html = FAIL
-LINUX : LayoutTests/fast/replaced/applet-display-none.html = FAIL
-LINUX : LayoutTests/fast/replaced/object-display-none.html = FAIL
 LINUX : LayoutTests/fast/text/international/bidi-linebreak-001.html = FAIL
 LINUX : LayoutTests/fast/text/international/bidi-linebreak-002.html = FAIL
 LINUX : LayoutTests/fast/text/international/bidi-linebreak-003.html = FAIL
@@ -375,6 +369,7 @@ LINUX : LayoutTests/svg/W3C-SVG-1.1/animate-elem-81-t.svg = FAIL PASS
 MAC : LayoutTests/svg/W3C-SVG-1.1/coords-viewattr-01-b.svg = FAIL
 MAC : LayoutTests/svg/W3C-SVG-1.1/coords-viewattr-02-b.svg = FAIL
 LINUX : LayoutTests/svg/W3C-SVG-1.1/pservers-grad-14-b.svg = FAIL
+WIN : LayoutTests/svg/W3C-SVG-1.1/pservers-grad-16-b.svg = FAIL
 MAC : LayoutTests/svg/W3C-SVG-1.1/render-elems-03-t.svg = FAIL
 DEFER LINUX MAC : LayoutTests/svg/W3C-SVG-1.1/text-text-03-b.svg = FAIL PASS
 LINUX : LayoutTests/svg/carto.net/colourpicker.svg = FAIL
@@ -937,10 +932,8 @@ LayoutTests/fast/forms/form-element-geometry.html = FAIL
 DEFER LINUX WIN : LayoutTests/fast/forms/listbox-deselect-scroll.html = FAIL
 DEFER LINUX WIN : LayoutTests/fast/forms/listbox-selection-2.html = FAIL
 DEFER LINUX WIN : LayoutTests/fast/forms/select-item-background-clip.html = FAIL
-// The pixel diff is ok, but the render tree is different because of
-// our forked modifications to RenderTextControlMultiLine.cpp, specifically
-// the calls to set the overflow in createInnerTextStyle.
-DEFER : LayoutTests/fast/forms/textarea-rows-cols.html = FAIL
+// The pixel diff looks ok, but the render trees are pretty different.
+LayoutTests/fast/forms/textarea-rows-cols.html = FAIL
 LayoutTests/fast/invalid/residual-style.html = FAIL
 // Linux pixeltest failure: We, with Windows, are failing to repaint correctly
 LINUX WIN : LayoutTests/fast/repaint/overflow-outline-repaint.html = FAIL
@@ -1798,14 +1791,44 @@ LayoutTests/svg/custom/pointer-events-path.svg = FAIL
 WIN MAC : LayoutTests/svg/custom/pointer-events-text.svg = FAIL
 
 // New tests from merge 41181:41217
-DEFER : LayoutTests/fast/dom/getBoundingClientRect-getClientRects-relative-to-viewport.html = FAIL
+LINUX WIN : LayoutTests/fast/replaced/embed-display-none.html = FAIL
+LINUX WIN : LayoutTests/fast/replaced/applet-display-none.html = FAIL
+LINUX WIN : LayoutTests/fast/replaced/object-display-none.html = FAIL
+LINUX WIN : LayoutTests/fast/lists/list-marker-with-line-height.html = FAIL
+LINUX WIN : LayoutTests/fast/overflow/overflow-stacking.html = FAIL
+LINUX WIN : LayoutTests/fast/overflow/overflow-float-stacking.html = FAIL
+LayoutTests/fast/dom/getBoundingClientRect-getClientRects-relative-to-viewport.html = FAIL
 
 // Regressions from merge 41181:41217
+// New baseline upstream
+LINUX WIN : LayoutTests/fast/events/offsetX-offsetY.html = FAIL
+LINUX WIN : LayoutTests/editing/selection/select-all-iframe.html = FAIL
+WIN : LayoutTests/editing/selection/select-from-textfield-outwards.html = FAIL
+LINUX WIN : LayoutTests/editing/selection/select-missing-image.html = FAIL
 WIN : LayoutTests/fast/lists/drag-into-marker.html = FAIL
 LINUX WIN : LayoutTests/fast/overflow/004.html = FAIL
 LINUX WIN : LayoutTests/fast/overflow/hidden-scrollbar-resize.html = FAIL
 LINUX WIN : LayoutTests/fast/overflow/hit-test-overflow-controls.html = FAIL
 LINUX : LayoutTests/fast/canvas/set-colors.html = CRASH
 
-// mbelshe to fix.  Temporarily disable while tree red.
-chrome/fast/dom/extensions/interval.html = FAIL
+// Regressions from merge 41217:41268
+// New tests
+DEFER : LayoutTests/fast/dom/Window/customized-property-survives-gc.html = FAIL
+DEFER : LayoutTests/fast/inline/inline-continuation-borders.html = FAIL
+DEFER : LayoutTests/fast/inline/vertical-align-text-bottom.html = FAIL
+DEFER : LayoutTests/fast/dom/Window/webkitConvertPoint.html = FAIL
+DEFER : LayoutTests/fast/gradients/background-clipped.html = FAIL
+
+// Regressions from merge 41217:41268
+// Other failures
+LayoutTests/css1/text_properties/vertical_align.html = FAIL
+LayoutTests/fast/repaint/transform-absolute-in-positioned-container.html = FAIL
+// SVG Mask-related tests. Most likely result of http://trac.webkit.org/changeset/41266.
+LayoutTests/svg/W3C-SVG-1.1/masking-intro-01-f.svg = FAIL
+LayoutTests/svg/custom/grayscale-gradient-mask.svg = FAIL
+LayoutTests/svg/custom/js-late-mask-and-object-creation.svg = FAIL
+LayoutTests/svg/custom/js-late-mask-creation.svg = FAIL
+LayoutTests/svg/custom/mask-changes.svg = FAIL
+LayoutTests/svg/custom/mask-child-changes.svg = FAIL
+LayoutTests/svg/custom/mask-inside-defs.svg = FAIL
+LayoutTests/svg/custom/visibility-override-mask.svg = FAIL
diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj
index b8a6979..94990b5 100644
--- a/webkit/webkit.xcodeproj/project.pbxproj
+++ b/webkit/webkit.xcodeproj/project.pbxproj
@@ -832,7 +832,6 @@
 		5320C95A0F548814005A25AA /* SVGResourceFilterPlatformDataMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E973D0D7F3EDA001ECF42 /* SVGResourceFilterPlatformDataMac.mm */; };
 		5320C95B0F548814005A25AA /* SVGResourceMarker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E975F0D7F3EDA001ECF42 /* SVGResourceMarker.cpp */; };
 		5320C95C0F548814005A25AA /* SVGResourceMasker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E97610D7F3EDA001ECF42 /* SVGResourceMasker.cpp */; };
-		5320C95D0F548814005A25AA /* SVGResourceMaskerCg.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E96D90D7F3EDA001ECF42 /* SVGResourceMaskerCg.mm */; };
 		5320C95E0F548814005A25AA /* SVGRootInlineBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5C180AC0E958F3D006EAF87 /* SVGRootInlineBox.cpp */; };
 		5320C95F0F548814005A25AA /* SVGScriptElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E98A50D7F3EDC001ECF42 /* SVGScriptElement.cpp */; };
 		5320C9600F548814005A25AA /* SVGSetElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E98A80D7F3EDC001ECF42 /* SVGSetElement.cpp */; };
@@ -1323,6 +1322,7 @@
 		938D0F760F573770009F1128 /* webkitclient_impl.cc in Sources */ = {isa = PBXBuildFile; fileRef = 938D0F730F573770009F1128 /* webkitclient_impl.cc */; };
 		93AF52490F001CAB0073C62D /* media_player_private_impl.cc in Sources */ = {isa = PBXBuildFile; fileRef = 93AF52480F001CAB0073C62D /* media_player_private_impl.cc */; };
 		93AF57990F0198CD0073C62D /* webkit_glue_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93AF57980F0198CD0073C62D /* webkit_glue_mac.mm */; };
+		97EE9A8C2D6020F99D3D200E /* V8WebKitPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2904951B751F48ED9C632DD6 /* V8WebKitPoint.cpp */; };
 		A5779DD6BC0DA17AB7DE63D4 /* GCController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 715E874BCC05E0A3DD5E5D8F /* GCController.cpp */; };
 		A743B3FB0F45E9CB0035EFA9 /* HTMLElementFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A743B3F80F45E9CB0035EFA9 /* HTMLElementFactory.cpp */; };
 		A7CBB2A60F327C8D00360BF5 /* debugger_bridge.cc in Sources */ = {isa = PBXBuildFile; fileRef = A7CBB2A40F327C8D00360BF5 /* debugger_bridge.cc */; };
@@ -1539,6 +1539,8 @@
 		1459AC310DEBF6A597167F45 /* webplugin_delegate.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = webplugin_delegate.cc; sourceTree = "<group>"; };
 		1DF458E80DD265C670E05B03 /* RenderSelectionInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSelectionInfo.h; sourceTree = "<group>"; };
 		20EF92D9CD4E55999674A63E /* CurrentTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CurrentTime.h; sourceTree = "<group>"; };
+		2904951B751F48ED9C632DD6 /* V8WebKitPoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = V8WebKitPoint.cpp; path = ../chrome/Debug/obj/V8Bindings/DerivedSources/V8WebKitPoint.cpp; sourceTree = SOURCE_ROOT; };
+		2BCE85178EC4DBF2E1135560 /* V8WebKitPoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = V8WebKitPoint.h; path = ../chrome/Debug/obj/V8Bindings/DerivedSources/V8WebKitPoint.h; sourceTree = SOURCE_ROOT; };
 		31493A4FA536C112F8C2FB03 /* PNGImageEncoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PNGImageEncoder.cpp; path = "../third_party/WebKit/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp"; sourceTree = SOURCE_ROOT; };
 		31C1FF1C3BB820B928CFE9BD /* V8DOMWindowCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = V8DOMWindowCustom.cpp; sourceTree = "<group>"; };
 		35DEC96C125DC674B5C9FA27 /* Interval.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Interval.cpp; path = port/bindings/v8/extensions/Interval.cpp; sourceTree = SOURCE_ROOT; };
@@ -3549,8 +3551,6 @@
 		7B5E96C20D7F3EDA001ECF42 /* GradientAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GradientAttributes.h; path = ../GradientAttributes.h; sourceTree = "<group>"; };
 		7B5E96D60D7F3EDA001ECF42 /* SVGResourceFilterCg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGResourceFilterCg.cpp; sourceTree = "<group>"; };
 		7B5E96D70D7F3EDA001ECF42 /* SVGResourceFilterCg.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SVGResourceFilterCg.mm; sourceTree = "<group>"; };
-		7B5E96D80D7F3EDA001ECF42 /* SVGResourceMaskerCg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGResourceMaskerCg.cpp; sourceTree = "<group>"; };
-		7B5E96D90D7F3EDA001ECF42 /* SVGResourceMaskerCg.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SVGResourceMaskerCg.mm; sourceTree = "<group>"; };
 		7B5E96E40D7F3EDA001ECF42 /* SVGFEHelpersCg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGFEHelpersCg.h; sourceTree = "<group>"; };
 		7B5E96E50D7F3EDA001ECF42 /* SVGFEHelpersCg.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SVGFEHelpersCg.mm; sourceTree = "<group>"; };
 		7B5E96EB0D7F3EDA001ECF42 /* SVGFilterEffectCg.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SVGFilterEffectCg.mm; sourceTree = "<group>"; };
@@ -4101,6 +4101,7 @@
 		82761F810E3FAC700030D324 /* AccessibilityObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibilityObject.cpp; sourceTree = "<group>"; };
 		82761F820E3FAC700030D324 /* AccessibilityObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilityObject.h; sourceTree = "<group>"; };
 		82F14D600ED230E700B36428 /* webcursor_mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = webcursor_mac.mm; sourceTree = "<group>"; };
+		880D17272205116600E1E049 /* WebKitPoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitPoint.h; sourceTree = "<group>"; };
 		89F4A0D30F200D59000A326A /* V8CanvasPixelArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = V8CanvasPixelArray.cpp; sourceTree = "<group>"; };
 		89F4A0D40F200D59000A326A /* V8CanvasPixelArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = V8CanvasPixelArray.h; sourceTree = "<group>"; };
 		89F4A1FC0F2101F8000A326A /* V8CanvasPixelArrayCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = V8CanvasPixelArrayCustom.cpp; sourceTree = "<group>"; };
@@ -4592,6 +4593,7 @@
 				41A3624C0F003B3000778012 /* EventHandlerChromium.cpp */,
 				41A3624D0F003B3000778012 /* FrameChromium.cpp */,
 				41A3624E0F003B3000778012 /* FrameChromium.h */,
+				880D17272205116600E1E049 /* WebKitPoint.h */,
 			);
 			name = chromium;
 			sourceTree = "<group>";
@@ -4856,6 +4858,8 @@
 				4CDA86D8A0B62BD0EBF07D78 /* AnimationControllerPrivate.h */,
 				7FF1567A8464BD6DC36B47CD /* MainThreadChromium.cpp */,
 				31493A4FA536C112F8C2FB03 /* PNGImageEncoder.cpp */,
+				2BCE85178EC4DBF2E1135560 /* V8WebKitPoint.h */,
+				2904951B751F48ED9C632DD6 /* V8WebKitPoint.cpp */,
 			);
 			sourceTree = "<group>";
 		};
@@ -6806,8 +6810,6 @@
 			children = (
 				7B5E96D60D7F3EDA001ECF42 /* SVGResourceFilterCg.cpp */,
 				7B5E96D70D7F3EDA001ECF42 /* SVGResourceFilterCg.mm */,
-				7B5E96D80D7F3EDA001ECF42 /* SVGResourceMaskerCg.cpp */,
-				7B5E96D90D7F3EDA001ECF42 /* SVGResourceMaskerCg.mm */,
 			);
 			path = cg;
 			sourceTree = "<group>";
@@ -8776,6 +8778,7 @@
 				9384489F0F16B06E0075F4C5 /* V8WebKitCSSKeyframesRule.cpp in Sources */,
 				25B9F25199984DFE5E4A59AE /* V8WebKitCSSMatrix.cpp in Sources */,
 				938448A00F16B06E0075F4C5 /* V8WebKitCSSTransformValue.cpp in Sources */,
+				97EE9A8C2D6020F99D3D200E /* V8WebKitPoint.cpp in Sources */,
 				938448A10F16B06E0075F4C5 /* V8WebKitTransitionEvent.cpp in Sources */,
 				938448A20F16B06E0075F4C5 /* V8WheelEvent.cpp in Sources */,
 				938448A30F16B06E0075F4C5 /* V8XMLHttpRequest.cpp in Sources */,
@@ -9585,7 +9588,6 @@
 				5320C95A0F548814005A25AA /* SVGResourceFilterPlatformDataMac.mm in Sources */,
 				5320C95B0F548814005A25AA /* SVGResourceMarker.cpp in Sources */,
 				5320C95C0F548814005A25AA /* SVGResourceMasker.cpp in Sources */,
-				5320C95D0F548814005A25AA /* SVGResourceMaskerCg.mm in Sources */,
 				5320C95E0F548814005A25AA /* SVGRootInlineBox.cpp in Sources */,
 				5320C95F0F548814005A25AA /* SVGScriptElement.cpp in Sources */,
 				5320C9600F548814005A25AA /* SVGSetElement.cpp in Sources */,