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

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

Issue 1105103003: Update renderer in core/css. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 7 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 | Annotate | Revision Log
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 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 // Textarea considers overflow visible as auto. 401 // Textarea considers overflow visible as auto.
402 style.setOverflowX(style.overflowX() == OVISIBLE ? OAUTO : style.overflo wX()); 402 style.setOverflowX(style.overflowX() == OVISIBLE ? OAUTO : style.overflo wX());
403 style.setOverflowY(style.overflowY() == OVISIBLE ? OAUTO : style.overflo wY()); 403 style.setOverflowY(style.overflowY() == OVISIBLE ? OAUTO : style.overflo wY());
404 return; 404 return;
405 } 405 }
406 406
407 if (isHTMLPlugInElement(element)) { 407 if (isHTMLPlugInElement(element)) {
408 style.setRequiresAcceleratedCompositingForExternalReasons(toHTMLPlugInEl ement(element).shouldAccelerate()); 408 style.setRequiresAcceleratedCompositingForExternalReasons(toHTMLPlugInEl ement(element).shouldAccelerate());
409 409
410 // Plugins should get the standard replaced width/height instead of 'aut o'. 410 // Plugins should get the standard replaced width/height instead of 'aut o'.
411 // Replaced renderers get this for free, and fallback content doesn't co unt. 411 // Replaced layoutObjects get this for free, and fallback content doesn' t count.
412 if (toHTMLPlugInElement(element).usePlaceholderContent()) { 412 if (toHTMLPlugInElement(element).usePlaceholderContent()) {
413 if (style.width().isAuto()) 413 if (style.width().isAuto())
414 style.setWidth(Length(LayoutReplaced::defaultWidth, Fixed)); 414 style.setWidth(Length(LayoutReplaced::defaultWidth, Fixed));
415 if (style.height().isAuto()) 415 if (style.height().isAuto())
416 style.setHeight(Length(LayoutReplaced::defaultHeight, Fixed)); 416 style.setHeight(Length(LayoutReplaced::defaultHeight, Fixed));
417 } 417 }
418 418
419 return; 419 return;
420 } 420 }
421 } 421 }
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
482 if (style.writingMode() != TopToBottomWritingMode && (style.display() == BOX || style.display() == INLINE_BOX)) 482 if (style.writingMode() != TopToBottomWritingMode && (style.display() == BOX || style.display() == INLINE_BOX))
483 style.setWritingMode(TopToBottomWritingMode); 483 style.setWritingMode(TopToBottomWritingMode);
484 484
485 if (parentStyle.isDisplayFlexibleOrGridBox()) { 485 if (parentStyle.isDisplayFlexibleOrGridBox()) {
486 style.setFloating(NoFloat); 486 style.setFloating(NoFloat);
487 style.setDisplay(equivalentBlockDisplay(style.display(), style.isFloatin g(), !m_useQuirksModeStyles)); 487 style.setDisplay(equivalentBlockDisplay(style.display(), style.isFloatin g(), !m_useQuirksModeStyles));
488 } 488 }
489 } 489 }
490 490
491 } 491 }
OLDNEW
« no previous file with comments | « Source/core/css/invalidation/StyleInvalidator.cpp ('k') | Source/core/css/resolver/StyleResolver.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698