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

Side by Side Diff: Source/core/rendering/RenderBox.cpp

Issue 702913002: Updating custom scrollbar style (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: addressed review comments by rune Created 6 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:
View unified diff | Download patch
« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 204
205 // Our opaqueness might have changed without triggering layout. 205 // Our opaqueness might have changed without triggering layout.
206 if (diff.needsPaintInvalidation()) { 206 if (diff.needsPaintInvalidation()) {
207 RenderObject* parentToInvalidate = parent(); 207 RenderObject* parentToInvalidate = parent();
208 for (unsigned i = 0; i < backgroundObscurationTestMaxDepth && parentToIn validate; ++i) { 208 for (unsigned i = 0; i < backgroundObscurationTestMaxDepth && parentToIn validate; ++i) {
209 parentToInvalidate->invalidateBackgroundObscurationStatus(); 209 parentToInvalidate->invalidateBackgroundObscurationStatus();
210 parentToInvalidate = parentToInvalidate->parent(); 210 parentToInvalidate = parentToInvalidate->parent();
211 } 211 }
212 } 212 }
213 213
214 if (isDocumentElement() || isBody()) 214 if (isDocumentElement() || isBody()) {
215 document().view()->recalculateScrollbarOverlayStyle(); 215 document().view()->recalculateScrollbarOverlayStyle();
216 216 document().view()->recalculateCustomScrollbarStyle();
217 }
217 updateShapeOutsideInfoAfterStyleChange(*style(), oldStyle); 218 updateShapeOutsideInfoAfterStyleChange(*style(), oldStyle);
218 updateGridPositionAfterStyleChange(oldStyle); 219 updateGridPositionAfterStyleChange(oldStyle);
219 } 220 }
220 221
221 void RenderBox::updateShapeOutsideInfoAfterStyleChange(const RenderStyle& style, const RenderStyle* oldStyle) 222 void RenderBox::updateShapeOutsideInfoAfterStyleChange(const RenderStyle& style, const RenderStyle* oldStyle)
222 { 223 {
223 const ShapeValue* shapeOutside = style.shapeOutside(); 224 const ShapeValue* shapeOutside = style.shapeOutside();
224 const ShapeValue* oldShapeOutside = oldStyle ? oldStyle->shapeOutside() : Re nderStyle::initialShapeOutside(); 225 const ShapeValue* oldShapeOutside = oldStyle ? oldStyle->shapeOutside() : Re nderStyle::initialShapeOutside();
225 226
226 Length shapeMargin = style.shapeMargin(); 227 Length shapeMargin = style.shapeMargin();
(...skipping 4211 matching lines...) Expand 10 before | Expand all | Expand 10 after
4438 4439
4439 setLogicalTop(oldLogicalTop); 4440 setLogicalTop(oldLogicalTop);
4440 setLogicalWidth(oldLogicalWidth); 4441 setLogicalWidth(oldLogicalWidth);
4441 setMarginLeft(oldMarginLeft); 4442 setMarginLeft(oldMarginLeft);
4442 setMarginRight(oldMarginRight); 4443 setMarginRight(oldMarginRight);
4443 4444
4444 return borderBox; 4445 return borderBox;
4445 } 4446 }
4446 4447
4447 } // namespace blink 4448 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698