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/port | |
| 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/port')
| -rw-r--r-- | webkit/port/bindings/v8/ScriptController.cpp | 2 | ||||
| -rw-r--r-- | webkit/port/bindings/v8/ScriptController.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/webkit/port/bindings/v8/ScriptController.cpp b/webkit/port/bindings/v8/ScriptController.cpp index d6be744..0f5c2ed 100644 --- a/webkit/port/bindings/v8/ScriptController.cpp +++ b/webkit/port/bindings/v8/ScriptController.cpp @@ -241,7 +241,7 @@ PassRefPtr<EventListener> ScriptController::createInlineEventListener( return m_proxy->createInlineEventListener(functionName, code, node); } -void ScriptController::setEventHandlerLineno(int lineno) +void ScriptController::setEventHandlerLineNumber(int lineno) { m_proxy->setEventHandlerLineno(lineno); } diff --git a/webkit/port/bindings/v8/ScriptController.h b/webkit/port/bindings/v8/ScriptController.h index 70994c5..84bd3bf 100644 --- a/webkit/port/bindings/v8/ScriptController.h +++ b/webkit/port/bindings/v8/ScriptController.h @@ -216,7 +216,7 @@ public: static void gcUnprotectJSWrapper(void* object); void finishedWithEvent(Event*); - void setEventHandlerLineno(int lineno); + void setEventHandlerLineNumber(int lineno); void setProcessingTimerCallback(bool b) { m_processingTimerCallback = b; } bool processingUserGesture() const; |