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

7 files changed, 16 insertions, 0 deletions

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;