diff options
| author | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-23 07:13:31 +0000 |
|---|---|---|
| committer | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-23 07:13:31 +0000 |
| commit | 07f99f066b009eec245ac04e1d07854d0e2861c0 (patch) | |
| tree | 88dabc514e4c2d3a2b321741e595e888d262ae27 /webkit/glue/webframe_impl.cc | |
| parent | 434bbefbc20f7bb5ce6cd6cb50d57b8e33163ffb (diff) | |
| download | chromium_src-07f99f066b009eec245ac04e1d07854d0e2861c0.zip chromium_src-07f99f066b009eec245ac04e1d07854d0e2861c0.tar.gz chromium_src-07f99f066b009eec245ac04e1d07854d0e2861c0.tar.bz2 | |
Merge: chromium side [42671:42725]
Rebaselines:
http://trac.webkit.org/changeset/42722 resulted in
LayoutTests/editing/inserting/insert-3907422-fix.html
LayoutTests/editing/pasteboard/paste-text-015.html
LayoutTests/editing/style/font-family-with-space.html
http://trac.webkit.org/changeset/42723 resulted in
LayoutTests/editing/selection/select-all-iframe.html
LayoutTests/svg/custom/pointer-events-path.svg
http://trac.webkit.org/changeset/42716 resulted in
LayoutTests/fast/dom/HTMLSelectElement/named-options.html
http://trac.webkit.org/changeset/42725
Broke the close event behavior and resulted in disabling these ui tests:
* BrowserCloseBeforeUnloadOK and
* BrowserCloseBeforeUnloadCancel
Review URL: http://codereview.chromium.org/92051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14291 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webframe_impl.cc')
| -rw-r--r-- | webkit/glue/webframe_impl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc index 3a90612..6c55b48 100644 --- a/webkit/glue/webframe_impl.cc +++ b/webkit/glue/webframe_impl.cc @@ -1933,7 +1933,7 @@ void WebFrameImpl::EndPrint() { } int WebFrameImpl::PendingFrameUnloadEventCount() const { - return frame()->eventHandler()->pendingFrameUnloadEventCount(); + return frame()->domWindow()->pendingUnloadEventListeners(); } void WebFrameImpl::RegisterPasswordListener( |