Source/WebCore/css/CSSProperty.cpp - Issue 12470005: Merge 144626

Side by Side Diff: Source/WebCore/css/CSSProperty.cpp

Issue 12470005: Merge 144626 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/

Patch Set: Created 7 years, 9 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:

OLD	NEW
1 /**	1 /**

2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)	2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)

3 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.	3 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.

4 *	4 *

5 * This library is free software; you can redistribute it and/or	5 * This library is free software; you can redistribute it and/or

6 * modify it under the terms of the GNU Library General Public	6 * modify it under the terms of the GNU Library General Public

7 * License as published by the Free Software Foundation; either	7 * License as published by the Free Software Foundation; either

8 * version 2 of the License, or (at your option) any later version.	8 * version 2 of the License, or (at your option) any later version.

9 *	9 *

10 * This library is distributed in the hope that it will be useful,	10 * This library is distributed in the hope that it will be useful,

(...skipping 471 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
482 case CSSPropertyTextOverlineColor:	482 case CSSPropertyTextOverlineColor:

483 case CSSPropertyTextOverlineMode:	483 case CSSPropertyTextOverlineMode:

484 case CSSPropertyTextOverlineStyle:	484 case CSSPropertyTextOverlineStyle:

485 case CSSPropertyTextOverlineWidth:	485 case CSSPropertyTextOverlineWidth:

486 case CSSPropertyTextUnderline:	486 case CSSPropertyTextUnderline:

487 case CSSPropertyTextUnderlineColor:	487 case CSSPropertyTextUnderlineColor:

488 case CSSPropertyTextUnderlineMode:	488 case CSSPropertyTextUnderlineMode:

489 case CSSPropertyTextUnderlineStyle:	489 case CSSPropertyTextUnderlineStyle:

490 case CSSPropertyTextUnderlineWidth:	490 case CSSPropertyTextUnderlineWidth:

491 case CSSPropertyTop:	491 case CSSPropertyTop:

	492 case CSSPropertyTransition:

	493 case CSSPropertyTransitionDelay:

	494 case CSSPropertyTransitionDuration:

	495 case CSSPropertyTransitionProperty:

	496 case CSSPropertyTransitionTimingFunction:

492 case CSSPropertyUnicodeBidi:	497 case CSSPropertyUnicodeBidi:

493 case CSSPropertyUnicodeRange:	498 case CSSPropertyUnicodeRange:

494 case CSSPropertyVerticalAlign:	499 case CSSPropertyVerticalAlign:

495 case CSSPropertyWidth:	500 case CSSPropertyWidth:

496 case CSSPropertyZIndex:	501 case CSSPropertyZIndex:

497 case CSSPropertyWebkitAnimation:	502 case CSSPropertyWebkitAnimation:

498 case CSSPropertyWebkitAnimationDelay:	503 case CSSPropertyWebkitAnimationDelay:

499 case CSSPropertyWebkitAnimationDirection:	504 case CSSPropertyWebkitAnimationDirection:

500 case CSSPropertyWebkitAnimationDuration:	505 case CSSPropertyWebkitAnimationDuration:

501 case CSSPropertyWebkitAnimationFillMode:	506 case CSSPropertyWebkitAnimationFillMode:

(...skipping 198 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
700 }	705 }

701	706

702 void CSSProperty::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const	707 void CSSProperty::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const

703 {	708 {

704 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);	709 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);

705 info.addMember(m_value, "value");	710 info.addMember(m_value, "value");

706 info.ignoreMember(m_metadata);	711 info.ignoreMember(m_metadata);

707 }	712 }

708	713

709 } // namespace WebCore	714 } // namespace WebCore

OLD	NEW

« no previous file with comments | « Source/WebCore/css/CSSProperty.h ('k') | Source/WebCore/css/CSSPropertyNames.in » ('j') | no next file with comments »