Source/core/frame/FrameView.cpp - Issue 59573002: Add Frame::isMainFrame and deploy it

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: Source/core/frame/FrameView.cpp

Issue 59573002: Add Frame::isMainFrame and deploy it (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 7 years, 1 month 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: Source/core/frame/FrameView.cpp

diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp

index c0ec9b8b66d7160a05b5e2257f2cc57cb1cad98b..4166305b390ab3e34ed552a4fec1d304b73ffa59 100644

--- a/Source/core/frame/FrameView.cpp

+++ b/Source/core/frame/FrameView.cpp

@@ -585,7 +585,7 @@ void FrameView::applyOverflowToViewport(RenderObject* o, ScrollbarMode& hMode, S

}

bool ignoreOverflowHidden = false;

- if (m_frame->settings()->ignoreMainFrameOverflowHiddenQuirk() && m_frame->page()->mainFrame() == m_frame)

+ if (m_frame->settings()->ignoreMainFrameOverflowHiddenQuirk() && m_frame->isMainFrame())

ignoreOverflowHidden = true;

switch (overflowX) {

@@ -3478,7 +3478,7 @@ void FrameView::setCursor(const Cursor& cursor)

bool FrameView::isMainFrame() const

{

- return m_frame->page() && m_frame->page()->mainFrame() == m_frame;

+ return m_frame->isMainFrame();

}

void FrameView::frameRectsChanged()

« no previous file with comments | « Source/core/frame/Frame.cpp ('k') | Source/core/html/ImageDocument.cpp » ('j') | no next file with comments »