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

Side by Side Diff: third_party/WebKit/Source/core/html/HTMLTableElement.cpp

Issue 2346193002: Split CSSPrimitiveValue into CSSPrimitiveValue and CSSIdentifierValue (Closed)
Patch Set: Rebase please work Created 4 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) 1997 Martin Jones (mjones@kde.org) 2 * Copyright (C) 1997 Martin Jones (mjones@kde.org)
3 * (C) 1997 Torben Weis (weis@kde.org) 3 * (C) 1997 Torben Weis (weis@kde.org)
4 * (C) 1998 Waldo Bastian (bastian@kde.org) 4 * (C) 1998 Waldo Bastian (bastian@kde.org)
5 * (C) 1999 Lars Knoll (knoll@kde.org) 5 * (C) 1999 Lars Knoll (knoll@kde.org)
6 * (C) 1999 Antti Koivisto (koivisto@kde.org) 6 * (C) 1999 Antti Koivisto (koivisto@kde.org)
7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2010, 2011 Apple Inc. All rights reserved. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2010, 2011 Apple Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 11 matching lines...) Expand all
22 * Boston, MA 02110-1301, USA. 22 * Boston, MA 02110-1301, USA.
23 */ 23 */
24 24
25 #include "core/html/HTMLTableElement.h" 25 #include "core/html/HTMLTableElement.h"
26 26
27 #include "bindings/core/v8/ExceptionState.h" 27 #include "bindings/core/v8/ExceptionState.h"
28 #include "bindings/core/v8/ExceptionStatePlaceholder.h" 28 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
29 #include "core/CSSPropertyNames.h" 29 #include "core/CSSPropertyNames.h"
30 #include "core/CSSValueKeywords.h" 30 #include "core/CSSValueKeywords.h"
31 #include "core/HTMLNames.h" 31 #include "core/HTMLNames.h"
32 #include "core/css/CSSIdentifierValue.h"
32 #include "core/css/CSSImageValue.h" 33 #include "core/css/CSSImageValue.h"
33 #include "core/css/CSSInheritedValue.h" 34 #include "core/css/CSSInheritedValue.h"
34 #include "core/css/CSSPrimitiveValue.h"
35 #include "core/css/StylePropertySet.h" 35 #include "core/css/StylePropertySet.h"
36 #include "core/dom/Attribute.h" 36 #include "core/dom/Attribute.h"
37 #include "core/dom/ElementTraversal.h" 37 #include "core/dom/ElementTraversal.h"
38 #include "core/dom/ExceptionCode.h" 38 #include "core/dom/ExceptionCode.h"
39 #include "core/dom/NodeListsNodeData.h" 39 #include "core/dom/NodeListsNodeData.h"
40 #include "core/dom/StyleChangeReason.h" 40 #include "core/dom/StyleChangeReason.h"
41 #include "core/html/HTMLTableCaptionElement.h" 41 #include "core/html/HTMLTableCaptionElement.h"
42 #include "core/html/HTMLTableCellElement.h" 42 #include "core/html/HTMLTableCellElement.h"
43 #include "core/html/HTMLTableRowElement.h" 43 #include "core/html/HTMLTableRowElement.h"
44 #include "core/html/HTMLTableRowsCollection.h" 44 #include "core/html/HTMLTableRowsCollection.h"
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
461 break; 461 break;
462 case SolidBordersRowsOnly: 462 case SolidBordersRowsOnly:
463 style->setProperty(CSSPropertyBorderTopWidth, CSSValueThin); 463 style->setProperty(CSSPropertyBorderTopWidth, CSSValueThin);
464 style->setProperty(CSSPropertyBorderBottomWidth, CSSValueThin); 464 style->setProperty(CSSPropertyBorderBottomWidth, CSSValueThin);
465 style->setProperty(CSSPropertyBorderTopStyle, CSSValueSolid); 465 style->setProperty(CSSPropertyBorderTopStyle, CSSValueSolid);
466 style->setProperty(CSSPropertyBorderBottomStyle, CSSValueSolid); 466 style->setProperty(CSSPropertyBorderBottomStyle, CSSValueSolid);
467 style->setProperty(CSSPropertyBorderColor, *CSSInheritedValue::create()) ; 467 style->setProperty(CSSPropertyBorderColor, *CSSInheritedValue::create()) ;
468 break; 468 break;
469 case SolidBorders: 469 case SolidBorders:
470 style->setProperty(CSSPropertyBorderWidth, *CSSPrimitiveValue::create(1, CSSPrimitiveValue::UnitType::Pixels)); 470 style->setProperty(CSSPropertyBorderWidth, *CSSPrimitiveValue::create(1, CSSPrimitiveValue::UnitType::Pixels));
471 style->setProperty(CSSPropertyBorderStyle, *CSSPrimitiveValue::createIde ntifier(CSSValueSolid)); 471 style->setProperty(CSSPropertyBorderStyle, *CSSIdentifierValue::create(C SSValueSolid));
472 style->setProperty(CSSPropertyBorderColor, *CSSInheritedValue::create()) ; 472 style->setProperty(CSSPropertyBorderColor, *CSSInheritedValue::create()) ;
473 break; 473 break;
474 case InsetBorders: 474 case InsetBorders:
475 style->setProperty(CSSPropertyBorderWidth, *CSSPrimitiveValue::create(1, CSSPrimitiveValue::UnitType::Pixels)); 475 style->setProperty(CSSPropertyBorderWidth, *CSSPrimitiveValue::create(1, CSSPrimitiveValue::UnitType::Pixels));
476 style->setProperty(CSSPropertyBorderStyle, *CSSPrimitiveValue::createIde ntifier(CSSValueInset)); 476 style->setProperty(CSSPropertyBorderStyle, *CSSIdentifierValue::create(C SSValueInset));
477 style->setProperty(CSSPropertyBorderColor, *CSSInheritedValue::create()) ; 477 style->setProperty(CSSPropertyBorderColor, *CSSInheritedValue::create()) ;
478 break; 478 break;
479 case NoBorders: 479 case NoBorders:
480 // If 'rules=none' then allow any borders set at cell level to take effe ct. 480 // If 'rules=none' then allow any borders set at cell level to take effe ct.
481 break; 481 break;
482 } 482 }
483 483
484 if (m_padding) 484 if (m_padding)
485 style->setProperty(CSSPropertyPadding, *CSSPrimitiveValue::create(m_padd ing, CSSPrimitiveValue::UnitType::Pixels)); 485 style->setProperty(CSSPropertyPadding, *CSSPrimitiveValue::create(m_padd ing, CSSPrimitiveValue::UnitType::Pixels));
486 486
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 return getAttribute(summaryAttr); 559 return getAttribute(summaryAttr);
560 } 560 }
561 561
562 DEFINE_TRACE(HTMLTableElement) 562 DEFINE_TRACE(HTMLTableElement)
563 { 563 {
564 visitor->trace(m_sharedCellStyle); 564 visitor->trace(m_sharedCellStyle);
565 HTMLElement::trace(visitor); 565 HTMLElement::trace(visitor);
566 } 566 }
567 567
568 } // namespace blink 568 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698