| 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. | 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. |
| 6 * All rights reserved. | 6 * All rights reserved. |
| 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> | 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> |
| 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> | 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> |
| 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. | 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. |
| 10 * (http://www.torchmobile.com/) | 10 * (http://www.torchmobile.com/) |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 193 style.setWhiteSpace(NORMAL); | 193 style.setWhiteSpace(NORMAL); |
| 194 else | 194 else |
| 195 style.setWhiteSpace(NOWRAP); | 195 style.setWhiteSpace(NOWRAP); |
| 196 } | 196 } |
| 197 return; | 197 return; |
| 198 } | 198 } |
| 199 | 199 |
| 200 if (isHTMLTableElement(element)) { | 200 if (isHTMLTableElement(element)) { |
| 201 // Tables never support the -webkit-* values for text-align and will reset | 201 // Tables never support the -webkit-* values for text-align and will reset |
| 202 // back to the default. | 202 // back to the default. |
| 203 if (style.textAlign() == WEBKIT_LEFT || | 203 if (style.textAlign() == ETextAlign::WebkitLeft || |
| 204 style.textAlign() == WEBKIT_CENTER || style.textAlign() == WEBKIT_RIGHT) | 204 style.textAlign() == ETextAlign::WebkitCenter || |
| 205 style.setTextAlign(TASTART); | 205 style.textAlign() == ETextAlign::WebkitRight) |
| 206 style.setTextAlign(ETextAlign::Start); |
| 206 return; | 207 return; |
| 207 } | 208 } |
| 208 | 209 |
| 209 if (isHTMLFrameElement(element) || isHTMLFrameSetElement(element)) { | 210 if (isHTMLFrameElement(element) || isHTMLFrameSetElement(element)) { |
| 210 // Frames and framesets never honor position:relative or position:absolute. | 211 // Frames and framesets never honor position:relative or position:absolute. |
| 211 // This is necessary to fix a crash where a site tries to position these | 212 // This is necessary to fix a crash where a site tries to position these |
| 212 // objects. They also never honor display. | 213 // objects. They also never honor display. |
| 213 style.setPosition(StaticPosition); | 214 style.setPosition(StaticPosition); |
| 214 style.setDisplay(EDisplay::Block); | 215 style.setDisplay(EDisplay::Block); |
| 215 return; | 216 return; |
| (...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 462 style.setDisplay(EDisplay::Block); | 463 style.setDisplay(EDisplay::Block); |
| 463 | 464 |
| 464 // Columns don't apply to svg text elements. | 465 // Columns don't apply to svg text elements. |
| 465 if (isSVGTextElement(*element)) | 466 if (isSVGTextElement(*element)) |
| 466 style.clearMultiCol(); | 467 style.clearMultiCol(); |
| 467 } | 468 } |
| 468 adjustStyleForAlignment(style, parentStyle); | 469 adjustStyleForAlignment(style, parentStyle); |
| 469 } | 470 } |
| 470 | 471 |
| 471 } // namespace blink | 472 } // namespace blink |
| OLD | NEW |