From de56f378336660dcc848763c80267a5e063ae47d Mon Sep 17 00:00:00 2001 From: "tc@google.com" Date: Wed, 1 Oct 2008 22:31:35 +0000 Subject: Merge the chrome_webkit_merge_branch back on to trunk. This brings us up to webkit@36102. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2778 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/glue/webframe.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'webkit/glue/webframe.h') diff --git a/webkit/glue/webframe.h b/webkit/glue/webframe.h index a63158a..2169549 100644 --- a/webkit/glue/webframe.h +++ b/webkit/glue/webframe.h @@ -354,6 +354,9 @@ class WebFrame : public base::RefCounted { // but no additional loads should occur. virtual bool IsReloadAllowingStaleData() const = 0; + // Only for test_shell + virtual int PendingFrameUnloadEventCount() const = 0; + private: DISALLOW_COPY_AND_ASSIGN(WebFrame); }; -- cgit v1.1