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

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: fix logic for elapsedTime in event 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
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 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 // Menulists should have visible overflow 329 // Menulists should have visible overflow
330 if (style->appearance() == MenulistPart) { 330 if (style->appearance() == MenulistPart) {
331 style->setOverflowX(OVISIBLE); 331 style->setOverflowX(OVISIBLE);
332 style->setOverflowY(OVISIBLE); 332 style->setOverflowY(OVISIBLE);
333 } 333 }
334 334
335 // Cull out any useless layers and also repeat patterns into additional laye rs. 335 // Cull out any useless layers and also repeat patterns into additional laye rs.
336 style->adjustBackgroundLayers(); 336 style->adjustBackgroundLayers();
337 style->adjustMaskLayers(); 337 style->adjustMaskLayers();
338 338
339 // Do the same for animations and transitions.
dstockwell 2013/10/08 21:02:59 this should stay here and be guarded by !enable we
Timothy Loh 2013/10/09 01:33:07 This should work fine for both old/new with it mov
340 style->adjustAnimations();
341 style->adjustTransitions();
342
343 // Important: Intrinsic margins get added to controls before the theme has a djusted the style, since the theme will 339 // Important: Intrinsic margins get added to controls before the theme has a djusted the style, since the theme will
344 // alter fonts and heights/widths. 340 // alter fonts and heights/widths.
345 if (e && e->isFormControlElement() && style->fontSize() >= 11) { 341 if (e && e->isFormControlElement() && style->fontSize() >= 11) {
346 // Don't apply intrinsic margins to image buttons. The designer knows ho w big the images are, 342 // Don't apply intrinsic margins to image buttons. The designer knows ho w big the images are,
347 // so we have to treat all image buttons as though they were explicitly sized. 343 // so we have to treat all image buttons as though they were explicitly sized.
348 if (!e->hasTagName(inputTag) || !toHTMLInputElement(e)->isImageButton()) 344 if (!e->hasTagName(inputTag) || !toHTMLInputElement(e)->isImageButton())
349 addIntrinsicMargins(style); 345 addIntrinsicMargins(style);
350 } 346 }
351 347
352 // Let the theme also have a crack at adjusting the style. 348 // Let the theme also have a crack at adjusting the style.
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 if (prop.isNamedGridArea() && !map.contains(prop.namedGridLine())) \ 413 if (prop.isNamedGridArea() && !map.contains(prop.namedGridLine())) \
418 style->setGrid##Prop(GridPosition()); 414 style->setGrid##Prop(GridPosition());
419 415
420 CLEAR_UNKNOWN_NAMED_AREA(columnStartPosition, ColumnStart); 416 CLEAR_UNKNOWN_NAMED_AREA(columnStartPosition, ColumnStart);
421 CLEAR_UNKNOWN_NAMED_AREA(columnEndPosition, ColumnEnd); 417 CLEAR_UNKNOWN_NAMED_AREA(columnEndPosition, ColumnEnd);
422 CLEAR_UNKNOWN_NAMED_AREA(rowStartPosition, RowStart); 418 CLEAR_UNKNOWN_NAMED_AREA(rowStartPosition, RowStart);
423 CLEAR_UNKNOWN_NAMED_AREA(rowEndPosition, RowEnd); 419 CLEAR_UNKNOWN_NAMED_AREA(rowEndPosition, RowEnd);
424 } 420 }
425 421
426 } 422 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698