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

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

Issue 138443013: Remove iframe@seamless (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Include remove tests Created 6 years, 11 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 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 // If we have first-letter pseudo style, do not share this style. 349 // If we have first-letter pseudo style, do not share this style.
350 if (style->hasPseudoStyle(FIRST_LETTER)) 350 if (style->hasPseudoStyle(FIRST_LETTER))
351 style->setUnique(); 351 style->setUnique();
352 352
353 // FIXME: when dropping the -webkit prefix on transform-style, we should als o have opacity < 1 cause flattening. 353 // FIXME: when dropping the -webkit prefix on transform-style, we should als o have opacity < 1 cause flattening.
354 if (style->preserves3D() && (style->overflowX() != OVISIBLE 354 if (style->preserves3D() && (style->overflowX() != OVISIBLE
355 || style->overflowY() != OVISIBLE 355 || style->overflowY() != OVISIBLE
356 || style->hasFilter())) 356 || style->hasFilter()))
357 style->setTransformStyle3D(TransformStyle3DFlat); 357 style->setTransformStyle3D(TransformStyle3DFlat);
358 358
359 // Seamless iframes behave like blocks. Map their display to inline-block wh en marked inline.
360 if (e && e->hasTagName(iframeTag) && style->display() == INLINE && toHTMLIFr ameElement(e)->shouldDisplaySeamlessly())
361 style->setDisplay(INLINE_BLOCK);
362
363 adjustGridItemPosition(style, parentStyle); 359 adjustGridItemPosition(style, parentStyle);
364 360
365 if (e && e->isSVGElement()) { 361 if (e && e->isSVGElement()) {
366 // Spec: http://www.w3.org/TR/SVG/masking.html#OverflowProperty 362 // Spec: http://www.w3.org/TR/SVG/masking.html#OverflowProperty
367 if (style->overflowY() == OSCROLL) 363 if (style->overflowY() == OSCROLL)
368 style->setOverflowY(OHIDDEN); 364 style->setOverflowY(OHIDDEN);
369 else if (style->overflowY() == OAUTO) 365 else if (style->overflowY() == OAUTO)
370 style->setOverflowY(OVISIBLE); 366 style->setOverflowY(OVISIBLE);
371 367
372 if (style->overflowX() == OSCROLL) 368 if (style->overflowX() == OSCROLL)
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 if (prop.isNamedGridArea() && !map.contains(prop.namedGridLine())) \ 410 if (prop.isNamedGridArea() && !map.contains(prop.namedGridLine())) \
415 style->setGrid##Prop(GridPosition()); 411 style->setGrid##Prop(GridPosition());
416 412
417 CLEAR_UNKNOWN_NAMED_AREA(columnStartPosition, ColumnStart); 413 CLEAR_UNKNOWN_NAMED_AREA(columnStartPosition, ColumnStart);
418 CLEAR_UNKNOWN_NAMED_AREA(columnEndPosition, ColumnEnd); 414 CLEAR_UNKNOWN_NAMED_AREA(columnEndPosition, ColumnEnd);
419 CLEAR_UNKNOWN_NAMED_AREA(rowStartPosition, RowStart); 415 CLEAR_UNKNOWN_NAMED_AREA(rowStartPosition, RowStart);
420 CLEAR_UNKNOWN_NAMED_AREA(rowEndPosition, RowEnd); 416 CLEAR_UNKNOWN_NAMED_AREA(rowEndPosition, RowEnd);
421 } 417 }
422 418
423 } 419 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698