third_party/WebKit/WebCore/loader/FrameLoader.h - Issue 21184: WebKit merge 40722:40785 (part 1)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/WebCore/loader/FrameLoader.h

Issue 21184: WebKit merge 40722:40785 (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 11 years, 10 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:

Index: third_party/WebKit/WebCore/loader/FrameLoader.h

===================================================================

--- third_party/WebKit/WebCore/loader/FrameLoader.h (revision 9391)

+++ third_party/WebKit/WebCore/loader/FrameLoader.h (working copy)

@@ -184,10 +184,10 @@

void loadEmptyDocumentSynchronously();

DocumentLoader* activeDocumentLoader() const;

- DocumentLoader* documentLoader() const;

- DocumentLoader* policyDocumentLoader() const;

- DocumentLoader* provisionalDocumentLoader() const;

- FrameState state() const;

+ DocumentLoader* documentLoader() const { return m_documentLoader.get(); }

+ DocumentLoader* policyDocumentLoader() const { return m_policyDocumentLoader.get(); }

+ DocumentLoader* provisionalDocumentLoader() const { return m_provisionalDocumentLoader.get(); }

+ FrameState state() const { return m_state; }

static double timeOfLastCompletedLoad();

bool shouldUseCredentialStorage(ResourceLoader*);