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

Side by Side Diff: third_party/WebKit/Source/core/loader/DocumentLoader.cpp

Issue 1738623004: Rename enums/functions that collide in chromium style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-4
Patch Set: get-names-5: rebase-and-stuff Created 4 years, 9 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2011 Google Inc. All rights reserved. 3 * Copyright (C) 2011 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 cancelLoadAfterXFrameOptionsOrCSPDenied(response); 426 cancelLoadAfterXFrameOptionsOrCSPDenied(response);
427 return; 427 return;
428 } 428 }
429 } 429 }
430 } 430 }
431 431
432 ASSERT(!mainResourceLoader() || !mainResourceLoader()->defersLoading()); 432 ASSERT(!mainResourceLoader() || !mainResourceLoader()->defersLoading());
433 433
434 m_response = response; 434 m_response = response;
435 435
436 if (isArchiveMIMEType(m_response.mimeType()) && m_mainResource->dataBufferin gPolicy() != BufferData) 436 if (isArchiveMIMEType(m_response.mimeType()) && m_mainResource->getDataBuffe ringPolicy() != BufferData)
437 m_mainResource->setDataBufferingPolicy(BufferData); 437 m_mainResource->setDataBufferingPolicy(BufferData);
438 438
439 if (!shouldContinueForResponse()) { 439 if (!shouldContinueForResponse()) {
440 InspectorInstrumentation::continueWithPolicyIgnore(m_frame, this, m_main Resource->identifier(), m_response); 440 InspectorInstrumentation::continueWithPolicyIgnore(m_frame, this, m_main Resource->identifier(), m_response);
441 cancelMainResourceLoad(ResourceError::cancelledError(m_request.url())); 441 cancelMainResourceLoad(ResourceError::cancelledError(m_request.url()));
442 return; 442 return;
443 } 443 }
444 444
445 if (m_response.isHTTP()) { 445 if (m_response.isHTTP()) {
446 int status = m_response.httpStatusCode(); 446 int status = m_response.httpStatusCode();
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
765 { 765 {
766 m_writer = createWriterFor(ownerDocument, init, mimeType(), m_writer ? m_wri ter->encoding() : emptyAtom, true, ForceSynchronousParsing); 766 m_writer = createWriterFor(ownerDocument, init, mimeType(), m_writer ? m_wri ter->encoding() : emptyAtom, true, ForceSynchronousParsing);
767 if (!source.isNull()) 767 if (!source.isNull())
768 m_writer->appendReplacingData(source); 768 m_writer->appendReplacingData(source);
769 endWriting(m_writer.get()); 769 endWriting(m_writer.get());
770 } 770 }
771 771
772 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader); 772 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader);
773 773
774 } // namespace blink 774 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutThemeMac.mm ('k') | third_party/WebKit/Source/core/loader/FrameFetchContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698