Chromium Code Reviews| Index: Source/core/loader/DocumentLoader.cpp |
| diff --git a/Source/core/loader/DocumentLoader.cpp b/Source/core/loader/DocumentLoader.cpp |
| index ff8973abc5c3e7e491144a5ba6d2021dd3837123..e5f9bacb3f95a8edc00bde9d2691df8c1ebda6f0 100644 |
| --- a/Source/core/loader/DocumentLoader.cpp |
| +++ b/Source/core/loader/DocumentLoader.cpp |
| @@ -91,6 +91,10 @@ DocumentLoader::DocumentLoader(LocalFrame* frame, const ResourceRequest& req, co |
| , m_isClientRedirect(false) |
| , m_replacesCurrentHistoryItem(false) |
| , m_navigationType(NavigationTypeOther) |
| +#if !ENABLE(OILPAN) |
| + , m_weakFactory(this) |
| +#endif |
| + , m_documentLoadTiming(this->weakReference()) |
|
dcheng
2015/08/18 17:24:47
Ditto.
|
| , m_timeOfLastDataReceived(0.0) |
| , m_applicationCacheHost(ApplicationCacheHost::create(this)) |
| , m_state(NotStarted) |
| @@ -179,6 +183,12 @@ void DocumentLoader::startPreload(Resource::Type type, FetchRequest& request) |
| fetcher()->preloadStarted(resource.get()); |
| } |
| +void DocumentLoader::didChangePerformanceTiming() |
| +{ |
| + if (frameLoader()) |
| + frameLoader()->client()->didChangePerformanceTiming(); |
| +} |
| + |
| void DocumentLoader::updateForSameDocumentNavigation(const KURL& newURL, SameDocumentNavigationSource sameDocumentNavigationSource) |
| { |
| KURL oldURL = m_request.url(); |
| @@ -432,6 +442,15 @@ bool DocumentLoader::shouldContinueForResponse() const |
| return true; |
| } |
| +WeakPtrWillBeRawPtr<DocumentLoader> DocumentLoader::weakReference() |
| +{ |
| +#if ENABLE(OILPAN) |
| + return this; |
| +#else |
| + return m_weakFactory.createWeakPtr(); |
| +#endif |
| +} |
| + |
| void DocumentLoader::cancelLoadAfterXFrameOptionsOrCSPDenied(const ResourceResponse& response) |
| { |
| InspectorInstrumentation::continueAfterXFrameOptionsDenied(m_frame, this, mainResourceIdentifier(), response); |