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

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

Issue 14070021: Rename 'UseCounter::observe' to 'UseCounter::count'. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebaseline. Created 7 years, 8 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/html/InputType.cpp ('k') | Source/core/loader/FrameLoader.cpp » ('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 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 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 return; 587 return;
588 } 588 }
589 } 589 }
590 590
591 ASSERT(!mainResourceLoader() || !mainResourceLoader()->defersLoading()); 591 ASSERT(!mainResourceLoader() || !mainResourceLoader()->defersLoading());
592 592
593 if (m_isLoadingMultipartContent) { 593 if (m_isLoadingMultipartContent) {
594 setupForReplace(); 594 setupForReplace();
595 m_mainResource->clear(); 595 m_mainResource->clear();
596 } else if (response.isMultipart()) { 596 } else if (response.isMultipart()) {
597 UseCounter::observe(m_frame->document(), UseCounter::MultipartMainResour ce); 597 UseCounter::count(m_frame->document(), UseCounter::MultipartMainResource );
598 m_isLoadingMultipartContent = true; 598 m_isLoadingMultipartContent = true;
599 } 599 }
600 600
601 m_response = response; 601 m_response = response;
602 602
603 if (m_identifierForLoadWithoutResourceLoader) 603 if (m_identifierForLoadWithoutResourceLoader)
604 frameLoader()->notifier()->dispatchDidReceiveResponse(this, m_identifier ForLoadWithoutResourceLoader, m_response, 0); 604 frameLoader()->notifier()->dispatchDidReceiveResponse(this, m_identifier ForLoadWithoutResourceLoader, m_response, 0);
605 605
606 if (!shouldContinueForResponse()) { 606 if (!shouldContinueForResponse()) {
607 InspectorInstrumentation::continueWithPolicyIgnore(m_frame, this, mainRe sourceLoader()->identifier(), m_response); 607 InspectorInstrumentation::continueWithPolicyIgnore(m_frame, this, mainRe sourceLoader()->identifier(), m_response);
(...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after
1173 commitLoad(resourceData->data(), resourceData->size()); 1173 commitLoad(resourceData->data(), resourceData->size());
1174 } 1174 }
1175 1175
1176 void DocumentLoader::handledOnloadEvents() 1176 void DocumentLoader::handledOnloadEvents()
1177 { 1177 {
1178 m_wasOnloadHandled = true; 1178 m_wasOnloadHandled = true;
1179 applicationCacheHost()->stopDeferringEvents(); 1179 applicationCacheHost()->stopDeferringEvents();
1180 } 1180 }
1181 1181
1182 } // namespace WebCore 1182 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/html/InputType.cpp ('k') | Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698