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

Side by Side Diff: Source/core/loader/FrameLoader.cpp

Issue 14785010: Remove a bunch of ApplicationCacheHost functions and parameters we don't use. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 7 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
« no previous file with comments | « Source/core/loader/DocumentLoader.cpp ('k') | Source/core/loader/ResourceLoader.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com>
6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> 7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
8 * Copyright (C) 2011 Google Inc. All rights reserved. 8 * Copyright (C) 2011 Google Inc. All rights reserved.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
(...skipping 2267 matching lines...) Expand 10 before | Expand all | Expand 10 after
2278 initialRequest.setFirstPartyForCookies(page->mainFrame()->loader()->docu mentLoader()->request().url()); 2278 initialRequest.setFirstPartyForCookies(page->mainFrame()->loader()->docu mentLoader()->request().url());
2279 2279
2280 addExtraFieldsToRequest(initialRequest); 2280 addExtraFieldsToRequest(initialRequest);
2281 2281
2282 unsigned long identifier = 0; 2282 unsigned long identifier = 0;
2283 ResourceRequest newRequest(initialRequest); 2283 ResourceRequest newRequest(initialRequest);
2284 requestFromDelegate(newRequest, identifier, error); 2284 requestFromDelegate(newRequest, identifier, error);
2285 2285
2286 if (error.isNull()) { 2286 if (error.isNull()) {
2287 ASSERT(!newRequest.isNull()); 2287 ASSERT(!newRequest.isNull());
2288 2288 documentLoader()->applicationCacheHost()->willStartLoadingSynchronously( newRequest);
2289 if (!documentLoader()->applicationCacheHost()->maybeLoadSynchronously(ne wRequest, error, response, data)) { 2289 ResourceHandle::loadResourceSynchronously(networkingContext(), newReques t, storedCredentials, error, response, data);
2290 ResourceHandle::loadResourceSynchronously(networkingContext(), newRe quest, storedCredentials, error, response, data);
2291 documentLoader()->applicationCacheHost()->maybeLoadFallbackSynchrono usly(newRequest, error, response, data);
2292 }
2293 } 2290 }
2294 int encodedDataLength = response.resourceLoadInfo() ? static_cast<int>(respo nse.resourceLoadInfo()->encodedDataLength) : -1; 2291 int encodedDataLength = response.resourceLoadInfo() ? static_cast<int>(respo nse.resourceLoadInfo()->encodedDataLength) : -1;
2295 notifier()->sendRemainingDelegateMessages(m_documentLoader.get(), identifier , response, data.data(), data.size(), encodedDataLength, error); 2292 notifier()->sendRemainingDelegateMessages(m_documentLoader.get(), identifier , response, data.data(), data.size(), encodedDataLength, error);
2296 return identifier; 2293 return identifier;
2297 } 2294 }
2298 2295
2299 const ResourceRequest& FrameLoader::originalRequest() const 2296 const ResourceRequest& FrameLoader::originalRequest() const
2300 { 2297 {
2301 return activeDocumentLoader()->originalRequestCopy(); 2298 return activeDocumentLoader()->originalRequestCopy();
2302 } 2299 }
(...skipping 731 matching lines...) Expand 10 before | Expand all | Expand 10 after
3034 FloatRect newWindowRect = DOMWindow::adjustWindowRect(page, windowRect); 3031 FloatRect newWindowRect = DOMWindow::adjustWindowRect(page, windowRect);
3035 3032
3036 page->chrome()->setWindowRect(newWindowRect); 3033 page->chrome()->setWindowRect(newWindowRect);
3037 page->chrome()->show(); 3034 page->chrome()->show();
3038 3035
3039 created = true; 3036 created = true;
3040 return frame; 3037 return frame;
3041 } 3038 }
3042 3039
3043 } // namespace WebCore 3040 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/loader/DocumentLoader.cpp ('k') | Source/core/loader/ResourceLoader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698