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

Side by Side Diff: Source/core/css/resolver/StyleAdjuster.cpp

Issue 26382004: Web Animations CSS: Implement CSS Transitions backed on Web Animations model (Closed) Base URL: https://chromium.googlesource.com/chromium/blink@master
Patch Set: update testexpectations and friends Created 7 years, 2 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
« no previous file with comments | « Source/core/animation/css/CSSAnimations.cpp ('k') | Source/core/css/resolver/StyleResolver.h » ('j') | 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) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 // Menulists should have visible overflow 328 // Menulists should have visible overflow
329 if (style->appearance() == MenulistPart) { 329 if (style->appearance() == MenulistPart) {
330 style->setOverflowX(OVISIBLE); 330 style->setOverflowX(OVISIBLE);
331 style->setOverflowY(OVISIBLE); 331 style->setOverflowY(OVISIBLE);
332 } 332 }
333 333
334 // Cull out any useless layers and also repeat patterns into additional laye rs. 334 // Cull out any useless layers and also repeat patterns into additional laye rs.
335 style->adjustBackgroundLayers(); 335 style->adjustBackgroundLayers();
336 style->adjustMaskLayers(); 336 style->adjustMaskLayers();
337 337
338 // Do the same for animations and transitions.
339 style->adjustAnimations();
340 style->adjustTransitions();
341
342 // Important: Intrinsic margins get added to controls before the theme has a djusted the style, since the theme will 338 // Important: Intrinsic margins get added to controls before the theme has a djusted the style, since the theme will
343 // alter fonts and heights/widths. 339 // alter fonts and heights/widths.
344 if (e && e->isFormControlElement() && style->fontSize() >= 11) { 340 if (e && e->isFormControlElement() && style->fontSize() >= 11) {
345 // Don't apply intrinsic margins to image buttons. The designer knows ho w big the images are, 341 // Don't apply intrinsic margins to image buttons. The designer knows ho w big the images are,
346 // so we have to treat all image buttons as though they were explicitly sized. 342 // so we have to treat all image buttons as though they were explicitly sized.
347 if (!e->hasTagName(inputTag) || !toHTMLInputElement(e)->isImageButton()) 343 if (!e->hasTagName(inputTag) || !toHTMLInputElement(e)->isImageButton())
348 addIntrinsicMargins(style); 344 addIntrinsicMargins(style);
349 } 345 }
350 346
351 // Let the theme also have a crack at adjusting the style. 347 // Let the theme also have a crack at adjusting the style.
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 if (prop.isNamedGridArea() && !map.contains(prop.namedGridLine())) \ 412 if (prop.isNamedGridArea() && !map.contains(prop.namedGridLine())) \
417 style->setGrid##Prop(GridPosition()); 413 style->setGrid##Prop(GridPosition());
418 414
419 CLEAR_UNKNOWN_NAMED_AREA(columnStartPosition, ColumnStart); 415 CLEAR_UNKNOWN_NAMED_AREA(columnStartPosition, ColumnStart);
420 CLEAR_UNKNOWN_NAMED_AREA(columnEndPosition, ColumnEnd); 416 CLEAR_UNKNOWN_NAMED_AREA(columnEndPosition, ColumnEnd);
421 CLEAR_UNKNOWN_NAMED_AREA(rowStartPosition, RowStart); 417 CLEAR_UNKNOWN_NAMED_AREA(rowStartPosition, RowStart);
422 CLEAR_UNKNOWN_NAMED_AREA(rowEndPosition, RowEnd); 418 CLEAR_UNKNOWN_NAMED_AREA(rowEndPosition, RowEnd);
423 } 419 }
424 420
425 } 421 }
OLDNEW
« no previous file with comments | « Source/core/animation/css/CSSAnimations.cpp ('k') | Source/core/css/resolver/StyleResolver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698