Convert types in WebFrameLoaderClientImpl in preparation for moving...

webkit/api/src/WebDataSourceImpl.h

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 21 matching lines @@
 #define WebDataSourceImpl_h
 
 // FIXME: This relative path is a temporary hack to support using this
 // header from webkit/glue.
 #include "../public/WebDataSource.h"
 #include "WebPluginLoadObserver.h"
 #include "WrappedResourceRequest.h"
 #include "WrappedResourceResponse.h"
 
 #include "DocumentLoader.h"
+#include "KURL.h"
 #include <wtf/PassOwnPtr.h>
 #include <wtf/OwnPtr.h>
 #include <wtf/Vector.h>
 
 namespace WebKit {
     class WebPluginLoadObserver;
 
     class WebDataSourceImpl : public WebCore::DocumentLoader, public WebDataSource {
     public:
         static PassRefPtr<WebDataSourceImpl> create(const WebCore::ResourceRequest&,
@@ skipping 13 matching lines @@
         virtual void redirectChain(WebVector<WebURL>&) const;
         virtual WebString pageTitle() const;
         virtual WebNavigationType navigationType() const;
         virtual double triggeringEventTime() const;
         virtual ExtraData* extraData() const;
         virtual void setExtraData(ExtraData*);
 
         static WebNavigationType toWebNavigationType(WebCore::NavigationType type);
 
         bool hasRedirectChain() const { return !m_redirectChain.isEmpty(); }
-        WebURL endOfRedirectChain() const;
+        const WebCore::KURL& endOfRedirectChain() const;
         void clearRedirectChain();
-        void appendRedirect(const WebURL& url);
+        void appendRedirect(const WebCore::KURL& url);
 
         PassOwnPtr<WebPluginLoadObserver> releasePluginLoadObserver() { return m_pluginLoadObserver.release(); }
         static void setNextPluginLoadObserver(PassOwnPtr<WebPluginLoadObserver>);
 
     private:
         WebDataSourceImpl(const WebCore::ResourceRequest&, const WebCore::SubstituteData&);
         ~WebDataSourceImpl();
 
         // Mutable because the const getters will magically sync these to the
         // latest version from WebKit.
         mutable WrappedResourceRequest m_originalRequestWrapper;
         mutable WrappedResourceRequest m_requestWrapper;
         mutable WrappedResourceResponse m_responseWrapper;
 
         // Lists all intermediate URLs that have redirected for the current provisional load.
         // See WebFrameLoaderClient::dispatchDidReceiveServerRedirectForProvisionalLoad for a
         // description of who modifies this when to keep it up to date.
-        Vector<WebURL> m_redirectChain;
+        Vector<WebCore::KURL> m_redirectChain;
 
         OwnPtr<ExtraData> m_extraData;
         OwnPtr<WebPluginLoadObserver> m_pluginLoadObserver;
 
         static WebPluginLoadObserver* m_nextPluginLoadObserver;
     };
 
 } // namespace WebKit
 
 #endif  // WebDataSourceImpl_h