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

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

Issue 2569883002: Rename documentState() to getDocumentState(). (Closed)
Patch Set: Created 4 years 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, 2009, 2010, 2011 Apple Inc. All rights 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
3 * reserved. 3 * reserved.
4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
6 * (http://www.torchmobile.com/) 6 * (http://www.torchmobile.com/)
7 * Copyright (C) 2008 Alp Toker <alp@atoker.com> 7 * Copyright (C) 2008 Alp Toker <alp@atoker.com>
8 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 8 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> 9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
10 * Copyright (C) 2011 Google Inc. All rights reserved. 10 * Copyright (C) 2011 Google Inc. All rights reserved.
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 508
509 if (dispatchWindowObjectAvailable) 509 if (dispatchWindowObjectAvailable)
510 dispatchDidClearDocumentOfWindowObject(); 510 dispatchDidClearDocumentOfWindowObject();
511 511
512 m_frame->document()->initContentSecurityPolicy( 512 m_frame->document()->initContentSecurityPolicy(
513 m_documentLoader ? m_documentLoader->releaseContentSecurityPolicy() 513 m_documentLoader ? m_documentLoader->releaseContentSecurityPolicy()
514 : ContentSecurityPolicy::create()); 514 : ContentSecurityPolicy::create());
515 515
516 if (m_provisionalItem && isBackForwardLoadType(m_loadType)) { 516 if (m_provisionalItem && isBackForwardLoadType(m_loadType)) {
517 m_frame->document()->setStateForNewFormElements( 517 m_frame->document()->setStateForNewFormElements(
518 m_provisionalItem->documentState()); 518 m_provisionalItem->getDocumentState());
519 } 519 }
520 } 520 }
521 521
522 void FrameLoader::didBeginDocument() { 522 void FrameLoader::didBeginDocument() {
523 DCHECK(m_frame); 523 DCHECK(m_frame);
524 DCHECK(m_frame->client()); 524 DCHECK(m_frame->client());
525 DCHECK(m_frame->document()); 525 DCHECK(m_frame->document());
526 DCHECK(m_frame->document()->fetcher()); 526 DCHECK(m_frame->document()->fetcher());
527 527
528 if (m_documentLoader) { 528 if (m_documentLoader) {
(...skipping 1430 matching lines...) Expand 10 before | Expand all | Expand 10 after
1959 m_documentLoader ? m_documentLoader->url() : String()); 1959 m_documentLoader ? m_documentLoader->url() : String());
1960 return tracedValue; 1960 return tracedValue;
1961 } 1961 }
1962 1962
1963 inline void FrameLoader::takeObjectSnapshot() const { 1963 inline void FrameLoader::takeObjectSnapshot() const {
1964 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, 1964 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this,
1965 toTracedValue()); 1965 toTracedValue());
1966 } 1966 }
1967 1967
1968 } // namespace blink 1968 } // namespace blink
OLDNEW
« no previous file with comments | « content/renderer/history_serialization.cc ('k') | third_party/WebKit/Source/core/loader/HistoryItem.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698