| OLD | NEW |
| 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 #include "core/html/HTMLPlugInElement.h" | 42 #include "core/html/HTMLPlugInElement.h" |
| 43 #include "core/html/HTMLTableCellElement.h" | 43 #include "core/html/HTMLTableCellElement.h" |
| 44 #include "core/html/HTMLTextAreaElement.h" | 44 #include "core/html/HTMLTextAreaElement.h" |
| 45 #include "core/layout/LayoutReplaced.h" | 45 #include "core/layout/LayoutReplaced.h" |
| 46 #include "core/layout/LayoutTheme.h" | 46 #include "core/layout/LayoutTheme.h" |
| 47 #include "core/style/ComputedStyle.h" | 47 #include "core/style/ComputedStyle.h" |
| 48 #include "core/style/ComputedStyleConstants.h" | 48 #include "core/style/ComputedStyleConstants.h" |
| 49 #include "core/svg/SVGSVGElement.h" | 49 #include "core/svg/SVGSVGElement.h" |
| 50 #include "platform/Length.h" | 50 #include "platform/Length.h" |
| 51 #include "platform/transforms/TransformOperations.h" | 51 #include "platform/transforms/TransformOperations.h" |
| 52 #include "public/platform/WebCompositorMutableProperties.h" |
| 52 #include "wtf/Assertions.h" | 53 #include "wtf/Assertions.h" |
| 53 | 54 |
| 54 namespace blink { | 55 namespace blink { |
| 55 | 56 |
| 56 using namespace HTMLNames; | 57 using namespace HTMLNames; |
| 57 | 58 |
| 58 static EDisplay equivalentBlockDisplay(EDisplay display, bool isFloating, bool s
trictParsing) | 59 static EDisplay equivalentBlockDisplay(EDisplay display, bool isFloating, bool s
trictParsing) |
| 59 { | 60 { |
| 60 switch (display) { | 61 switch (display) { |
| 61 case BLOCK: | 62 case BLOCK: |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 | 175 |
| 175 // We don't adjust the first letter style earlier because we may change
the display setting in | 176 // We don't adjust the first letter style earlier because we may change
the display setting in |
| 176 // adjustStyeForTagName() above. | 177 // adjustStyeForTagName() above. |
| 177 adjustStyleForFirstLetter(style); | 178 adjustStyleForFirstLetter(style); |
| 178 | 179 |
| 179 adjustStyleForDisplay(style, parentStyle, element ? &element->document()
: 0); | 180 adjustStyleForDisplay(style, parentStyle, element ? &element->document()
: 0); |
| 180 } else { | 181 } else { |
| 181 adjustStyleForFirstLetter(style); | 182 adjustStyleForFirstLetter(style); |
| 182 } | 183 } |
| 183 | 184 |
| 185 if (element && element->hasCompositorProxy()) |
| 186 style.setHasCompositorProxy(true); |
| 187 |
| 184 // Make sure our z-index value is only applied if the object is positioned. | 188 // Make sure our z-index value is only applied if the object is positioned. |
| 185 if (style.position() == StaticPosition && !parentStyleForcesZIndexToCreateSt
ackingContext(parentStyle)) | 189 if (style.position() == StaticPosition && !parentStyleForcesZIndexToCreateSt
ackingContext(parentStyle)) |
| 186 style.setHasAutoZIndex(); | 190 style.setHasAutoZIndex(); |
| 187 | 191 |
| 188 // Auto z-index becomes 0 for the root element and transparent objects. This
prevents | 192 // Auto z-index becomes 0 for the root element and transparent objects. This
prevents |
| 189 // cases where objects that should be blended as a single unit end up with a
non-transparent | 193 // cases where objects that should be blended as a single unit end up with a
non-transparent |
| 190 // object wedged in between them. Auto z-index also becomes 0 for objects th
at specify transforms/masks/reflections. | 194 // object wedged in between them. Auto z-index also becomes 0 for objects th
at specify transforms/masks/reflections. |
| 191 if (style.hasAutoZIndex() && ((element && element->document().documentElemen
t() == element) | 195 if (style.hasAutoZIndex() && ((element && element->document().documentElemen
t() == element) |
| 192 || style.hasOpacity() | 196 || style.hasOpacity() |
| 193 || style.hasTransformRelatedProperty() | 197 || style.hasTransformRelatedProperty() |
| (...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 484 // We want to count vertical percentage paddings/margins on flex items b
ecause our current | 488 // We want to count vertical percentage paddings/margins on flex items b
ecause our current |
| 485 // behavior is different from the spec and we want to gather compatibili
ty data. | 489 // behavior is different from the spec and we want to gather compatibili
ty data. |
| 486 if (style.paddingBefore().hasPercent() || style.paddingAfter().hasPercen
t()) | 490 if (style.paddingBefore().hasPercent() || style.paddingAfter().hasPercen
t()) |
| 487 UseCounter::count(document, UseCounter::FlexboxPercentagePaddingVert
ical); | 491 UseCounter::count(document, UseCounter::FlexboxPercentagePaddingVert
ical); |
| 488 if (style.marginBefore().hasPercent() || style.marginAfter().hasPercent(
)) | 492 if (style.marginBefore().hasPercent() || style.marginAfter().hasPercent(
)) |
| 489 UseCounter::count(document, UseCounter::FlexboxPercentageMarginVerti
cal); | 493 UseCounter::count(document, UseCounter::FlexboxPercentageMarginVerti
cal); |
| 490 } | 494 } |
| 491 } | 495 } |
| 492 | 496 |
| 493 } | 497 } |
| OLD | NEW |