Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(66)

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutBox.cpp

Issue 1738503003: Fix overlay scroll bar color on elements with dark background (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test after rebase Created 4 years, 9 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 // Our opaqueness might have changed without triggering layout. 271 // Our opaqueness might have changed without triggering layout.
272 if (diff.needsPaintInvalidation()) { 272 if (diff.needsPaintInvalidation()) {
273 LayoutObject* parentToInvalidate = parent(); 273 LayoutObject* parentToInvalidate = parent();
274 for (unsigned i = 0; i < backgroundObscurationTestMaxDepth && parentToIn validate; ++i) { 274 for (unsigned i = 0; i < backgroundObscurationTestMaxDepth && parentToIn validate; ++i) {
275 parentToInvalidate->invalidateBackgroundObscurationStatus(); 275 parentToInvalidate->invalidateBackgroundObscurationStatus();
276 parentToInvalidate = parentToInvalidate->parent(); 276 parentToInvalidate = parentToInvalidate->parent();
277 } 277 }
278 } 278 }
279 279
280 if (isDocumentElement() || isBody()) { 280 if (isDocumentElement() || isBody()) {
281 document().view()->recalculateScrollbarOverlayStyle(); 281 document().view()->recalculateScrollbarOverlayStyle(document().view()->d ocumentBackgroundColor());
282 document().view()->recalculateCustomScrollbarStyle(); 282 document().view()->recalculateCustomScrollbarStyle();
283 if (LayoutView* layoutView = view()) { 283 if (LayoutView* layoutView = view()) {
284 if (PaintLayerScrollableArea* scrollableArea = layoutView->scrollabl eArea()) { 284 if (PaintLayerScrollableArea* scrollableArea = layoutView->scrollabl eArea()) {
285 if (scrollableArea->horizontalScrollbar() && scrollableArea->hor izontalScrollbar()->isCustomScrollbar()) 285 if (scrollableArea->horizontalScrollbar() && scrollableArea->hor izontalScrollbar()->isCustomScrollbar())
286 scrollableArea->horizontalScrollbar()->styleChanged(); 286 scrollableArea->horizontalScrollbar()->styleChanged();
287 if (scrollableArea->verticalScrollbar() && scrollableArea->verti calScrollbar()->isCustomScrollbar()) 287 if (scrollableArea->verticalScrollbar() && scrollableArea->verti calScrollbar()->isCustomScrollbar())
288 scrollableArea->verticalScrollbar()->styleChanged(); 288 scrollableArea->verticalScrollbar()->styleChanged();
289 } 289 }
290 } 290 }
291 } 291 }
(...skipping 4385 matching lines...) Expand 10 before | Expand all | Expand 10 after
4677 } 4677 }
4678 4678
4679 void LayoutBox::IntrinsicSizingInfo::transpose() 4679 void LayoutBox::IntrinsicSizingInfo::transpose()
4680 { 4680 {
4681 size = size.transposedSize(); 4681 size = size.transposedSize();
4682 aspectRatio = aspectRatio.transposedSize(); 4682 aspectRatio = aspectRatio.transposedSize();
4683 std::swap(hasWidth, hasHeight); 4683 std::swap(hasWidth, hasHeight);
4684 } 4684 }
4685 4685
4686 } // namespace blink 4686 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameView.cpp ('k') | third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698