summaryrefslogtreecommitdiffstats
path: root/WEBKIT_MERGE_REVISION
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-16 21:50:29 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-16 21:50:29 +0000
commitaec53c706a0b9e2f2c65cb8cd2be5c4670829d83 (patch)
treed79f1c1a65f6d648de39619e54fa8c48e7f256bb /WEBKIT_MERGE_REVISION
parent3e21831b1796f52ae015b6dd62106830d81ebb71 (diff)
downloadchromium_src-aec53c706a0b9e2f2c65cb8cd2be5c4670829d83.zip
chromium_src-aec53c706a0b9e2f2c65cb8cd2be5c4670829d83.tar.gz
chromium_src-aec53c706a0b9e2f2c65cb8cd2be5c4670829d83.tar.bz2
Chrome side of webkit merge from 42547 to 42580.
In http://trac.webkit.org/changeset/42579 ScriptController::createInlineEventListener was changed to take 4 params instead of 3, so I updated the V8 ScriptController to do the same. We don't seem to need the extra arg because both v8_proxy::createSVGEventHandler and v8_proxy::createInlineEventListener are identical. Also one new .cpp/.h file from http://trac.webkit.org/changeset/42580 Review URL: http://codereview.chromium.org/79008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13884 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'WEBKIT_MERGE_REVISION')
-rw-r--r--WEBKIT_MERGE_REVISION2
1 files changed, 1 insertions, 1 deletions
diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION
index 83afda9..730c607 100644
--- a/WEBKIT_MERGE_REVISION
+++ b/WEBKIT_MERGE_REVISION
@@ -1 +1 @@
-http://svn.webkit.org/repository/webkit/trunk@42547 \ No newline at end of file
+http://svn.webkit.org/repository/webkit/trunk@42580 \ No newline at end of file