2011-03-16 Sreeram Ramachandran <sreeram@google.com>

Reviewed by Dimitri Glazkov. Revert of r80451. Decided to do this in WebCore instead. https://bugs.webkit.org/show_bug.cgi?id=55844 * public/WebFrame.h: * src/WebFrameImpl.cpp: * src/WebFrameImpl.h: Canonical link: https://commits.webkit.org/71155@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@81279 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Mar 16, 2011 · 271128f1b7a796fab05e6256ff32d0b1598e944d · 271128f
1 parent 3461856
commit 271128f1b7a796fab05e6256ff32d0b1598e944d
Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2011-03-16  Sreeram Ramachandran  <sreeram@google.com>
+
+        Reviewed by Dimitri Glazkov.
+
+        Revert of r80451. Decided to do this in WebCore instead.
+        https://bugs.webkit.org/show_bug.cgi?id=55844
+
+        * public/WebFrame.h:
+        * src/WebFrameImpl.cpp:
+        * src/WebFrameImpl.h:
+
 2011-03-15  Ilya Sherman  <isherman@chromium.org>
 
         Reviewed by Darin Fisher.

diff --git a/Source/WebKit/chromium/public/WebFrame.h b/Source/WebKit/chromium/public/WebFrame.h
@@ -365,10 +365,6 @@ class WebFrame {
     // with a suppressed opener.
     virtual bool willSuppressOpenerInNewFrame() const = 0;
 
-    // Returns true if this frame is in the midst of executing a beforeunload
-    // or unload event handler.
-    virtual bool pageDismissalEventBeingDispatched() const = 0;
-
 
     // Editing -------------------------------------------------------------
 

diff --git a/Source/WebKit/chromium/src/WebFrameImpl.cpp b/Source/WebKit/chromium/src/WebFrameImpl.cpp
@@ -1077,11 +1077,6 @@ bool WebFrameImpl::willSuppressOpenerInNewFrame() const
     return frame()->loader()->suppressOpenerInNewFrame();
 }
 
-bool WebFrameImpl::pageDismissalEventBeingDispatched() const
-{
-    return frame()->loader()->pageDismissalEventBeingDispatched();
-}
-
 void WebFrameImpl::replaceSelection(const WebString& text)
 {
     RefPtr<DocumentFragment> fragment = createFragmentFromText(

diff --git a/Source/WebKit/chromium/src/WebFrameImpl.h b/Source/WebKit/chromium/src/WebFrameImpl.h
@@ -138,7 +138,6 @@ class WebFrameImpl : public WebFrame, public RefCounted<WebFrameImpl> {
     virtual unsigned unloadListenerCount() const;
     virtual bool isProcessingUserGesture() const;
     virtual bool willSuppressOpenerInNewFrame() const;
-    virtual bool pageDismissalEventBeingDispatched() const;
     virtual void replaceSelection(const WebString&);
     virtual void insertText(const WebString&);
     virtual void setMarkedText(const WebString&, unsigned location, unsigned length);