Source/WebCore/page/FrameView.cpp - Issue 10442005: Merge 116476

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/WebCore/page/FrameView.cpp

Issue 10442005: Merge 116476 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/

Patch Set: Created 8 years, 7 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: Source/WebCore/page/FrameView.cpp

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

--- Source/WebCore/page/FrameView.cpp (revision 118271)

+++ Source/WebCore/page/FrameView.cpp (working copy)

@@ -482,12 +482,12 @@

// Try the <body> element first as a scrollbar source.

Element* body = doc ? doc->body() : 0;

if (body && body->renderer() && body->renderer()->style()->hasPseudoStyle(SCROLLBAR))

- return RenderScrollbar::createCustomScrollbar(this, orientation, body->renderer()->enclosingBox());

+ return RenderScrollbar::createCustomScrollbar(this, orientation, body);

// If the <body> didn't have a custom style, then the root element might.

Element* docElement = doc ? doc->documentElement() : 0;

if (docElement && docElement->renderer() && docElement->renderer()->style()->hasPseudoStyle(SCROLLBAR))

- return RenderScrollbar::createCustomScrollbar(this, orientation, docElement->renderBox());

+ return RenderScrollbar::createCustomScrollbar(this, orientation, docElement);

// If we have an owning iframe/frame element, then it can set the custom scrollbar also.

RenderPart* frameRenderer = m_frame->ownerRenderer();

@@ -2912,23 +2912,6 @@

return false;

}

-void FrameView::clearOwningRendererForCustomScrollbars(RenderBox* box)

- const HashSet<RefPtr<Widget> >* viewChildren = children();

- HashSet<RefPtr<Widget> >::const_iterator end = viewChildren->end();

- for (HashSet<RefPtr<Widget> >::const_iterator current = viewChildren->begin(); current != end; ++current) {

- Widget* widget = current->get();

- if (widget->isScrollbar()) {

- Scrollbar* scrollbar = static_cast<Scrollbar*>(widget);

- if (scrollbar->isCustomScrollbar()) {

- RenderScrollbar* customScrollbar = toRenderScrollbar(scrollbar);

- if (customScrollbar->owningRenderer() == box)

- customScrollbar->clearOwningRenderer();

- }

FrameView* FrameView::parentFrameView() const

{

if (Widget* parentView = parent()) {

« no previous file with comments | « Source/WebCore/page/FrameView.h ('k') | Source/WebCore/rendering/RenderBox.cpp » ('j') | no next file with comments »