Source/core/frame/FrameView.cpp - Issue 1340643004: Stop propagating customscrollbar styles across iframe boundaries.

Side by Side Diff: Source/core/frame/FrameView.cpp

Issue 1340643004: Stop propagating customscrollbar styles across iframe boundaries. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: fixing test cases Created 5 years, 3 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

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>	2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>

3 * 1999 Lars Knoll <knoll@kde.org>	3 * 1999 Lars Knoll <knoll@kde.org>

4 * 1999 Antti Koivisto <koivisto@kde.org>	4 * 1999 Antti Koivisto <koivisto@kde.org>

5 * 2000 Dirk Mueller <mueller@kde.org>	5 * 2000 Dirk Mueller <mueller@kde.org>

6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.	6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.

7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)	7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)

8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)	8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)

9 * Copyright (C) 2009 Google Inc. All rights reserved.	9 * Copyright (C) 2009 Google Inc. All rights reserved.

10 *	10 *

(...skipping 457 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
468 return true;	468 return true;

469 }	469 }

470	470

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

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

473 if (docElement && docElement->layoutObject() && docElement->layoutObject()-> style()->hasPseudoStyle(SCROLLBAR)) {	473 if (docElement && docElement->layoutObject() && docElement->layoutObject()-> style()->hasPseudoStyle(SCROLLBAR)) {

474 customScrollbarElement = docElement;	474 customScrollbarElement = docElement;

475 return true;	475 return true;

476 }	476 }

477	477

478 // If we have an owning ipage/LocalFrame element, then it can set the custom scrollbar also.	478 // If we have an ipage/LocalFrame element, then it can set the custom scroll bar also.

479 LayoutPart* frameLayoutObject = m_frame->ownerLayoutObject();	479 LayoutView* frameLayoutView = m_frame->contentLayoutObject();

480 if (frameLayoutObject && frameLayoutObject->style()->hasPseudoStyle(SCROLLBA R)) {	480 if (frameLayoutView && frameLayoutView->style()->hasPseudoStyle(SCROLLBAR)) {
	skobes 2015/09/16 01:49:04 Your test uses ::-webkit-scrollbar with no tag nam Your test uses ::-webkit-scrollbar with no tag name in the selector. Why doesn't it hit the code earlier in this method that tests for scrollbar pseudo styles on the <body> element? To put it another way: why would we ever care about scrollbar pseudo styles on the LayoutView, which cannot be directly selected in css? MuVen 2015/09/16 11:18:49 for these tests,::-webkit-scrollbar is defined in for these tests,::-webkit-scrollbar is defined in the body and while executing at this point m_frame->ownerLayoutObject returned body which has pseudo style scrollbar so custom scrollbar is created. Now as we have modified the logic, if particular iframe has pseudo style then we are creating custom-scrollbar for that iframe. So i have moved the ::-webkit-scrollbar selector from body to iframe so that tests gets passed. skobes 2015/09/16 15:06:12 If ::-webkit-scrollbar styles are added inside the Show quoted text On 2015/09/16 11:18:49, MuVen wrote: > for these tests,::-webkit-scrollbar is defined in the body and while executing > at this point m_frame->ownerLayoutObject returned body which has pseudo style > scrollbar so custom scrollbar is created. Now as we have modified the logic, if > particular iframe has pseudo style then we are creating custom-scrollbar for > that iframe. So i have moved the ::-webkit-scrollbar selector from body to > iframe so that tests gets passed. If ::-webkit-scrollbar styles are added inside the iframe's content document, they will show up in the computed style of the body element (inside the iframe). There's no reason to look at the LayoutView.
481 customScrollbarFrame = m_frame.get();	481 customScrollbarFrame = m_frame.get();

482 return true;	482 return true;

483 }	483 }

484	484

485 return false;	485 return false;

486 }	486 }

487	487

488 PassRefPtrWillBeRawPtr<Scrollbar> FrameView::createScrollbar(ScrollbarOrientatio n orientation)	488 PassRefPtrWillBeRawPtr<Scrollbar> FrameView::createScrollbar(ScrollbarOrientatio n orientation)

489 {	489 {

490 Element* customScrollbarElement = nullptr;	490 Element* customScrollbarElement = nullptr;

(...skipping 3434 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
3925	3925

3926 if (!graphicsLayer)	3926 if (!graphicsLayer)

3927 return;	3927 return;

3928	3928

3929 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL ayoutObject(), paintInvalidationContainer, viewRect);	3929 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL ayoutObject(), paintInvalidationContainer, viewRect);

3930	3930

3931 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing IntRect(viewRect)));	3931 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing IntRect(viewRect)));

3932 }	3932 }

3933	3933

3934 } // namespace blink	3934 } // namespace blink

OLD	NEW

« no previous file with comments | « LayoutTests/fast/events/scale-and-scroll-iframe-window.html ('k') | no next file » | no next file with comments »