| Index: Source/web/WebDataSourceImpl.h
|
| diff --git a/Source/web/WebDataSourceImpl.h b/Source/web/WebDataSourceImpl.h
|
| index 07fa8f7b37ba02b509de46e32dc93469f22e9aa6..124526f38724541a58deb99855bb7af19201d928 100644
|
| --- a/Source/web/WebDataSourceImpl.h
|
| +++ b/Source/web/WebDataSourceImpl.h
|
| @@ -45,11 +45,11 @@ namespace blink {
|
|
|
| class WebPluginLoadObserver;
|
|
|
| -class WebDataSourceImpl FINAL : public blink::DocumentLoader, public WebDataSource {
|
| +class WebDataSourceImpl FINAL : public DocumentLoader, public WebDataSource {
|
| public:
|
| - static PassRefPtr<WebDataSourceImpl> create(blink::LocalFrame*, const blink::ResourceRequest&, const blink::SubstituteData&);
|
| + static PassRefPtr<WebDataSourceImpl> create(LocalFrame*, const ResourceRequest&, const SubstituteData&);
|
|
|
| - static WebDataSourceImpl* fromDocumentLoader(blink::DocumentLoader* loader)
|
| + static WebDataSourceImpl* fromDocumentLoader(DocumentLoader* loader)
|
| {
|
| return static_cast<WebDataSourceImpl*>(loader);
|
| }
|
| @@ -70,13 +70,13 @@ public:
|
| virtual void setExtraData(ExtraData*) OVERRIDE;
|
| virtual void setNavigationStartTime(double) OVERRIDE;
|
|
|
| - static WebNavigationType toWebNavigationType(blink::NavigationType type);
|
| + static WebNavigationType toWebNavigationType(NavigationType);
|
|
|
| PassOwnPtr<WebPluginLoadObserver> releasePluginLoadObserver() { return m_pluginLoadObserver.release(); }
|
| static void setNextPluginLoadObserver(PassOwnPtr<WebPluginLoadObserver>);
|
|
|
| private:
|
| - WebDataSourceImpl(blink::LocalFrame*, const blink::ResourceRequest&, const blink::SubstituteData&);
|
| + WebDataSourceImpl(LocalFrame*, const ResourceRequest&, const SubstituteData&);
|
| virtual ~WebDataSourceImpl();
|
|
|
| // Mutable because the const getters will magically sync these to the
|
|
|