Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(26)

Side by Side Diff: Source/core/xml/XMLHttpRequest.cpp

Issue 23702040: Send synchronous loads through the cache. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Address comments Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2005-2007 Alexey Proskuryakov <ap@webkit.org> 3 * Copyright (C) 2005-2007 Alexey Proskuryakov <ap@webkit.org>
4 * Copyright (C) 2007, 2008 Julien Chaffraix <jchaffraix@webkit.org> 4 * Copyright (C) 2007, 2008 Julien Chaffraix <jchaffraix@webkit.org>
5 * Copyright (C) 2008, 2011 Google Inc. All rights reserved. 5 * Copyright (C) 2008, 2011 Google Inc. All rights reserved.
6 * Copyright (C) 2012 Intel Corporation 6 * Copyright (C) 2012 Intel Corporation
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Lesser General Public 9 * modify it under the terms of the GNU Lesser General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 781 matching lines...) Expand 10 before | Expand all | Expand 10 after
792 if (m_loader) { 792 if (m_loader) {
793 // Neither this object nor the JavaScript wrapper should be deleted while 793 // Neither this object nor the JavaScript wrapper should be deleted while
794 // a request is in progress because we need to keep the listeners al ive, 794 // a request is in progress because we need to keep the listeners al ive,
795 // and they are referenced by the JavaScript wrapper. 795 // and they are referenced by the JavaScript wrapper.
796 796
797 // m_loader was null, so there should be no pending activity at this point. 797 // m_loader was null, so there should be no pending activity at this point.
798 ASSERT(!hasPendingActivity()); 798 ASSERT(!hasPendingActivity());
799 setPendingActivity(this); 799 setPendingActivity(this);
800 } 800 }
801 } else { 801 } else {
802 request.setPriority(ResourceLoadPriorityVeryHigh);
803 InspectorInstrumentation::willLoadXHRSynchronously(scriptExecutionContex t());
804 ThreadableLoader::loadResourceSynchronously(scriptExecutionContext(), re quest, *this, options); 802 ThreadableLoader::loadResourceSynchronously(scriptExecutionContext(), re quest, *this, options);
805 InspectorInstrumentation::didLoadXHRSynchronously(scriptExecutionContext ());
806 } 803 }
807 804
808 if (!m_exceptionCode && m_error) 805 if (!m_exceptionCode && m_error)
809 m_exceptionCode = NetworkError; 806 m_exceptionCode = NetworkError;
810 if (m_exceptionCode) 807 if (m_exceptionCode)
811 es.throwDOMException(m_exceptionCode); 808 es.throwDOMException(m_exceptionCode);
812 } 809 }
813 810
814 void XMLHttpRequest::abort() 811 void XMLHttpRequest::abort()
815 { 812 {
(...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after
1295 { 1292 {
1296 return eventNames().interfaceForXMLHttpRequest; 1293 return eventNames().interfaceForXMLHttpRequest;
1297 } 1294 }
1298 1295
1299 ScriptExecutionContext* XMLHttpRequest::scriptExecutionContext() const 1296 ScriptExecutionContext* XMLHttpRequest::scriptExecutionContext() const
1300 { 1297 {
1301 return ActiveDOMObject::scriptExecutionContext(); 1298 return ActiveDOMObject::scriptExecutionContext();
1302 } 1299 }
1303 1300
1304 } // namespace WebCore 1301 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/loader/appcache/ApplicationCacheHost.h ('k') | Source/core/xml/XSLTProcessorLibxslt.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698