diff options
author | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-17 20:45:46 +0000 |
---|---|---|
committer | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-17 20:45:46 +0000 |
commit | caa9fdc35c4738519d6743f0e3223ce7761c4721 (patch) | |
tree | 7b12b3c92cfdbf0c02aee462b72a72b06f2dd241 /webkit/glue/webkit_glue.cc | |
parent | 6d2de293a9dd1d3566f5ab4526c14094a90e3b4b (diff) | |
download | chromium_src-caa9fdc35c4738519d6743f0e3223ce7761c4721.zip chromium_src-caa9fdc35c4738519d6743f0e3223ce7761c4721.tar.gz chromium_src-caa9fdc35c4738519d6743f0e3223ce7761c4721.tar.bz2 |
WebKit Merge 42580:42609, Chromium side.
Changes to ScriptController, glue due to http://trac.webkit.org/changeset/42583
Test rebaselines due to:
* http://trac.webkit.org/changeset/42599
* http://trac.webkit.org/changeset/42583
* http://trac.webkit.org/changeset/42600
* http://trac.webkit.org/changeset/42586
R=levin
Review URL: http://codereview.chromium.org/79038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13965 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webkit_glue.cc')
-rw-r--r-- | webkit/glue/webkit_glue.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc index e82fd42..51d0c75b 100644 --- a/webkit/glue/webkit_glue.cc +++ b/webkit/glue/webkit_glue.cc @@ -217,7 +217,7 @@ void ResetBeforeTestRun(WebView* view) { // This is papering over b/850700. But it passes a few more tests, so we'll // keep it for now. if (frame && frame->script()) - frame->script()->setEventHandlerLineno(0); + frame->script()->setEventHandlerLineNumber(0); // Reset the last click information so the clicks generated from previous // test aren't inherited (otherwise can mistake single/double/triple clicks) |