1 files changed, 6 insertions, 21 deletions
diff --git a/chromium/third_party/WebKit/Source/web/WebDataSourceImpl.cpp b/chromium/third_party/WebKit/Source/web/WebDataSourceImpl.cpp
index a07c29fe693..9c3a6026d37 100644
--- a/chromium/third_party/WebKit/Source/web/WebDataSourceImpl.cpp
+++ b/chromium/third_party/WebKit/Source/web/WebDataSourceImpl.cpp
@@ -29,11 +29,9 @@
  */
 
 #include "config.h"
-#include "WebDataSourceImpl.h"
+#include "web/WebDataSourceImpl.h"
 
-#include "ApplicationCacheHostInternal.h"
 #include "core/dom/Document.h"
-#include "core/loader/FrameLoader.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/WebURLError.h"
 #include "public/platform/WebVector.h"
@@ -48,9 +46,9 @@ static OwnPtr<WebPluginLoadObserver>& nextPluginLoadObserver()
     return nextPluginLoadObserver;
 }
 
-PassRefPtr<WebDataSourceImpl> WebDataSourceImpl::create(const ResourceRequest& request, const SubstituteData& data)
+PassRefPtr<WebDataSourceImpl> WebDataSourceImpl::create(LocalFrame* frame, const ResourceRequest& request, const SubstituteData& data)
 {
-    return adoptRef(new WebDataSourceImpl(request, data));
+    return adoptRef(new WebDataSourceImpl(frame, request, data));
 }
 
 const WebURLRequest& WebDataSourceImpl::originalRequest() const
@@ -108,11 +106,8 @@ WebNavigationType WebDataSourceImpl::navigationType() const
 
 double WebDataSourceImpl::triggeringEventTime() const
 {
-    if (!triggeringAction().event())
-        return 0.0;
-
     // DOMTimeStamp uses units of milliseconds.
-    return convertDOMTimeStampToSeconds(triggeringAction().event()->timeStamp());
+    return convertDOMTimeStampToSeconds(triggeringAction().eventTimeStamp());
 }
 
 WebDataSource::ExtraData* WebDataSourceImpl::extraData() const
@@ -126,16 +121,6 @@ void WebDataSourceImpl::setExtraData(ExtraData* extraData)
     m_extraData = adoptPtr(extraData);
 }
 
-WebApplicationCacheHost* WebDataSourceImpl::applicationCacheHost()
-{
-    return ApplicationCacheHostInternal::toWebApplicationCacheHost(DocumentLoader::applicationCacheHost());
-}
-
-void WebDataSourceImpl::setDeferMainResourceDataLoad(bool defer)
-{
-    DocumentLoader::setDeferMainResourceDataLoad(defer);
-}
-
 void WebDataSourceImpl::setNavigationStartTime(double navigationStart)
 {
     timing()->setNavigationStart(navigationStart);
@@ -165,8 +150,8 @@ void WebDataSourceImpl::setNextPluginLoadObserver(PassOwnPtr<WebPluginLoadObserv
     nextPluginLoadObserver() = observer;
 }
 
-WebDataSourceImpl::WebDataSourceImpl(const ResourceRequest& request, const SubstituteData& data)
-    : DocumentLoader(request, data)
+WebDataSourceImpl::WebDataSourceImpl(LocalFrame* frame, const ResourceRequest& request, const SubstituteData& data)
+    : DocumentLoader(frame, request, data)
 {
     if (!nextPluginLoadObserver())
         return;