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

Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h

 /*
  * Copyright (C) 2007 Kevin Ollivier <kevino@theolliviers.com>
  *
  * 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.
@@ skipping 142 matching lines @@
         virtual void transitionToCommittedForNewPage();
 
         virtual void didSaveToPageCache();
         virtual void didRestoreFromPageCache();
 
         virtual void dispatchDidBecomeFrameset(bool);
 
         virtual void updateGlobalHistory();
         virtual void updateGlobalHistoryRedirectLinks();
         virtual bool shouldGoToHistoryItem(HistoryItem*) const;
+        virtual bool shouldStopLoadingForHistoryItem(HistoryItem*) const;
         virtual void dispatchDidAddBackForwardItem(HistoryItem*) const;
         virtual void dispatchDidRemoveBackForwardItem(HistoryItem*) const;
         virtual void dispatchDidChangeBackForwardIndex() const;
         virtual void saveScrollPositionAndViewStateToItem(HistoryItem*);
         virtual bool canCachePage() const;
         
         virtual void didDisplayInsecureContent();
         virtual void didRunInsecureContent(SecurityOrigin*);
 
         virtual void setMainDocumentError(DocumentLoader*, const ResourceError&);
@@ skipping 63 matching lines @@
         wxWebView *m_webView;
         PluginView* m_pluginView;
         bool m_hasSentResponseToPlugin;
         ResourceResponse m_response;
         bool m_firstData;
     };
 
 }
 
 #endif