Source/core/frame/FrameView.cpp - Issue 750333004: Change rendering code to use RenderObject::resolveColor

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

Issue 750333004: Change rendering code to use RenderObject::resolveColor (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 6 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

« no previous file with comments | « no previous file | Source/core/paint/TableCellPainter.cpp » ('j') | no next file with comments »

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 2438 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2449 Element* bodyElement = frame().document()->body();	2449 Element* bodyElement = frame().document()->body();

2450	2450

2451 // We take the aggregate of the base background color	2451 // We take the aggregate of the base background color

2452 // the <html> background color, and the <body>	2452 // the <html> background color, and the <body>

2453 // background color to find the document color. The	2453 // background color to find the document color. The

2454 // addition of the base background color is not	2454 // addition of the base background color is not

2455 // technically part of the document background, but it	2455 // technically part of the document background, but it

2456 // otherwise poses problems when the aggregate is not	2456 // otherwise poses problems when the aggregate is not

2457 // fully opaque.	2457 // fully opaque.

2458 if (htmlElement && htmlElement->renderer())	2458 if (htmlElement && htmlElement->renderer())

2459 result = result.blend(htmlElement->renderer()->style()->visitedDependent Color(CSSPropertyBackgroundColor));	2459 result = result.blend(htmlElement->renderer()->resolveColor(CSSPropertyB ackgroundColor));

2460 if (bodyElement && bodyElement->renderer())	2460 if (bodyElement && bodyElement->renderer())

2461 result = result.blend(bodyElement->renderer()->style()->visitedDependent Color(CSSPropertyBackgroundColor));	2461 result = result.blend(bodyElement->renderer()->resolveColor(CSSPropertyB ackgroundColor));

2462	2462

2463 return result;	2463 return result;

2464 }	2464 }

2465	2465

2466 bool FrameView::hasCustomScrollbars() const	2466 bool FrameView::hasCustomScrollbars() const

2467 {	2467 {

2468 const ChildrenWidgetSet* viewChildren = children();	2468 const ChildrenWidgetSet* viewChildren = children();

2469 for (const RefPtrWillBeMember<Widget>& child : *viewChildren) {	2469 for (const RefPtrWillBeMember<Widget>& child : *viewChildren) {

2470 Widget* widget = child.get();	2470 Widget* widget = child.get();

2471 if (widget->isFrameView()) {	2471 if (widget->isFrameView()) {

(...skipping 1490 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
3962 return;	3962 return;

3963	3963

3964 ScrollableArea::setScrollOrigin(origin);	3964 ScrollableArea::setScrollOrigin(origin);

3965	3965

3966 // Update if the scroll origin changes, since our position will be different if the content size did not change.	3966 // Update if the scroll origin changes, since our position will be different if the content size did not change.

3967 if (updatePositionAtAll && updatePositionSynchronously)	3967 if (updatePositionAtAll && updatePositionSynchronously)

3968 updateScrollbars(scrollOffsetDouble());	3968 updateScrollbars(scrollOffsetDouble());

3969 }	3969 }

3970	3970

3971 } // namespace blink	3971 } // namespace blink

OLD	NEW