Merge: chromium side [42671:42725]...

webkit/glue/webframe_impl.cc

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 1915 matching lines @@
 }
 
 void WebFrameImpl::EndPrint() {
   DCHECK(print_context_.get());
   if (print_context_.get())
     print_context_->end();
   print_context_.reset(NULL);
 }
 
 int WebFrameImpl::PendingFrameUnloadEventCount() const {
-  return frame()->eventHandler()->pendingFrameUnloadEventCount();
+  return frame()->domWindow()->pendingUnloadEventListeners();
 }
 
 void WebFrameImpl::RegisterPasswordListener(
     PassRefPtr<WebCore::HTMLInputElement> input_element,
     webkit_glue::PasswordAutocompleteListener* listener) {
   RefPtr<WebCore::HTMLInputElement> element = input_element;
   DCHECK(password_listeners_.find(element) == password_listeners_.end());
   password_listeners_.set(element, listener);
 }
 
 webkit_glue::PasswordAutocompleteListener* WebFrameImpl::GetPasswordListener(
     WebCore::HTMLInputElement* input_element) {
   return password_listeners_.get(input_element);
 }
 
 void WebFrameImpl::ClearPasswordListeners() {
   for (PasswordListenerMap::iterator iter = password_listeners_.begin();
        iter != password_listeners_.end(); ++iter) {
     delete iter->second;
   }
   password_listeners_.clear();
 }