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

Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h

 /*
  * Copyright (C) 2006 Zack Rusin <zack@kde.org>
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * 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
@@ skipping 136 matching lines @@
 
     virtual void willChangeTitle(DocumentLoader*);
     virtual void didChangeTitle(DocumentLoader*);
 
     virtual void committedLoad(WebCore::DocumentLoader*, const char*, int);
     virtual void finishedLoading(DocumentLoader*);
 
     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 didDisplayInsecureContent();
     virtual void didRunInsecureContent(SecurityOrigin*);
 
     virtual ResourceError cancelledError(const ResourceRequest&);
     virtual ResourceError blockedError(const ResourceRequest&);
     virtual ResourceError cannotShowURLError(const ResourceRequest&);
     virtual ResourceError interruptForPolicyChangeError(const ResourceRequest&);
@@ skipping 97 matching lines @@
     // of a "representation", but we need to know when we're expected to have one.
     // See finishedLoading().
     bool m_hasRepresentation;
 
     ResourceError m_loadError;
 };
 
 }
 
 #endif