Merge 79107 - 2011-02-19 Charlie Reis <creis@chromium.org>...

Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h

 /*
  * Copyright (C) 2006 Zack Rusin <zack@kde.org>
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2008 Collabora Ltd. All rights reserved.
  *
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ skipping 123 matching lines @@
 
         virtual void willChangeTitle(WebCore::DocumentLoader*);
         virtual void didChangeTitle(WebCore::DocumentLoader*);
 
         virtual void committedLoad(WebCore::DocumentLoader*, const char*, int);
         virtual void finishedLoading(WebCore::DocumentLoader*);
 
         virtual void updateGlobalHistory();
         virtual void updateGlobalHistoryRedirectLinks();
         virtual bool shouldGoToHistoryItem(WebCore::HistoryItem*) const;
+        virtual bool shouldStopLoadingForHistoryItem(WebCore::HistoryItem*) const;
         virtual void dispatchDidAddBackForwardItem(WebCore::HistoryItem*) const;
         virtual void dispatchDidRemoveBackForwardItem(WebCore::HistoryItem*) const;
         virtual void dispatchDidChangeBackForwardIndex() const;
 
         virtual void didDisplayInsecureContent();
         virtual void didRunInsecureContent(WebCore::SecurityOrigin*);
 
         virtual WebCore::ResourceError cancelledError(const WebCore::ResourceRequest&);
         virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&);
         virtual WebCore::ResourceError cannotShowURLError(const WebCore::ResourceRequest&);
@@ skipping 45 matching lines @@
         bool m_loadingErrorPage;
 
         // Plugin view to redirect data to
         WebCore::PluginView* m_pluginView;
         bool m_hasSentResponseToPlugin;
     };
 
 }
 
 #endif