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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 17836006: Merge 153078 "Unprefix Flexbox" (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/1547/
Patch Set: Created 7 years, 6 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
« no previous file with comments | « Source/core/css/CSSProperties.in ('k') | Source/core/css/CSSPropertyNames.in » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 case CSSPropertyTouchAction: 494 case CSSPropertyTouchAction:
495 case CSSPropertyTransition: 495 case CSSPropertyTransition:
496 case CSSPropertyTransitionDelay: 496 case CSSPropertyTransitionDelay:
497 case CSSPropertyTransitionDuration: 497 case CSSPropertyTransitionDuration:
498 case CSSPropertyTransitionProperty: 498 case CSSPropertyTransitionProperty:
499 case CSSPropertyTransitionTimingFunction: 499 case CSSPropertyTransitionTimingFunction:
500 case CSSPropertyUnicodeBidi: 500 case CSSPropertyUnicodeBidi:
501 case CSSPropertyUnicodeRange: 501 case CSSPropertyUnicodeRange:
502 case CSSPropertyVectorEffect: 502 case CSSPropertyVectorEffect:
503 case CSSPropertyVerticalAlign: 503 case CSSPropertyVerticalAlign:
504 case CSSPropertyWebkitAlignContent: 504 case CSSPropertyAlignContent:
505 case CSSPropertyWebkitAlignItems: 505 case CSSPropertyAlignItems:
506 case CSSPropertyWebkitAlignSelf: 506 case CSSPropertyAlignSelf:
507 case CSSPropertyWebkitAnimation: 507 case CSSPropertyWebkitAnimation:
508 case CSSPropertyWebkitAnimationDelay: 508 case CSSPropertyWebkitAnimationDelay:
509 case CSSPropertyWebkitAnimationDirection: 509 case CSSPropertyWebkitAnimationDirection:
510 case CSSPropertyWebkitAnimationDuration: 510 case CSSPropertyWebkitAnimationDuration:
511 case CSSPropertyWebkitAnimationFillMode: 511 case CSSPropertyWebkitAnimationFillMode:
512 case CSSPropertyWebkitAnimationIterationCount: 512 case CSSPropertyWebkitAnimationIterationCount:
513 case CSSPropertyWebkitAnimationName: 513 case CSSPropertyWebkitAnimationName:
514 case CSSPropertyWebkitAnimationPlayState: 514 case CSSPropertyWebkitAnimationPlayState:
515 case CSSPropertyWebkitAnimationTimingFunction: 515 case CSSPropertyWebkitAnimationTimingFunction:
516 case CSSPropertyWebkitAppearance: 516 case CSSPropertyWebkitAppearance:
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
557 case CSSPropertyWebkitColumnGap: 557 case CSSPropertyWebkitColumnGap:
558 case CSSPropertyWebkitColumnProgression: 558 case CSSPropertyWebkitColumnProgression:
559 case CSSPropertyWebkitColumnRule: 559 case CSSPropertyWebkitColumnRule:
560 case CSSPropertyWebkitColumnRuleColor: 560 case CSSPropertyWebkitColumnRuleColor:
561 case CSSPropertyWebkitColumnRuleStyle: 561 case CSSPropertyWebkitColumnRuleStyle:
562 case CSSPropertyWebkitColumnRuleWidth: 562 case CSSPropertyWebkitColumnRuleWidth:
563 case CSSPropertyWebkitColumnSpan: 563 case CSSPropertyWebkitColumnSpan:
564 case CSSPropertyWebkitColumnWidth: 564 case CSSPropertyWebkitColumnWidth:
565 case CSSPropertyWebkitColumns: 565 case CSSPropertyWebkitColumns:
566 case CSSPropertyWebkitFilter: 566 case CSSPropertyWebkitFilter:
567 case CSSPropertyWebkitFlex: 567 case CSSPropertyFlex:
568 case CSSPropertyWebkitFlexBasis: 568 case CSSPropertyFlexBasis:
569 case CSSPropertyWebkitFlexDirection: 569 case CSSPropertyFlexDirection:
570 case CSSPropertyWebkitFlexFlow: 570 case CSSPropertyFlexFlow:
571 case CSSPropertyWebkitFlexGrow: 571 case CSSPropertyFlexGrow:
572 case CSSPropertyWebkitFlexShrink: 572 case CSSPropertyFlexShrink:
573 case CSSPropertyWebkitFlexWrap: 573 case CSSPropertyFlexWrap:
574 case CSSPropertyWebkitFontSizeDelta: 574 case CSSPropertyWebkitFontSizeDelta:
575 case CSSPropertyGridAfter: 575 case CSSPropertyGridAfter:
576 case CSSPropertyGridAutoColumns: 576 case CSSPropertyGridAutoColumns:
577 case CSSPropertyGridAutoFlow: 577 case CSSPropertyGridAutoFlow:
578 case CSSPropertyGridAutoRows: 578 case CSSPropertyGridAutoRows:
579 case CSSPropertyGridBefore: 579 case CSSPropertyGridBefore:
580 case CSSPropertyGridColumn: 580 case CSSPropertyGridColumn:
581 case CSSPropertyGridColumns: 581 case CSSPropertyGridColumns:
582 case CSSPropertyGridEnd: 582 case CSSPropertyGridEnd:
583 case CSSPropertyGridRow: 583 case CSSPropertyGridRow:
584 case CSSPropertyGridRows: 584 case CSSPropertyGridRows:
585 case CSSPropertyGridStart: 585 case CSSPropertyGridStart:
586 case CSSPropertyGridArea: 586 case CSSPropertyGridArea:
587 case CSSPropertyWebkitJustifyContent: 587 case CSSPropertyJustifyContent:
588 case CSSPropertyWebkitLineClamp: 588 case CSSPropertyWebkitLineClamp:
589 case CSSPropertyWebkitLogicalHeight: 589 case CSSPropertyWebkitLogicalHeight:
590 case CSSPropertyWebkitLogicalWidth: 590 case CSSPropertyWebkitLogicalWidth:
591 case CSSPropertyWebkitMarginAfter: 591 case CSSPropertyWebkitMarginAfter:
592 case CSSPropertyWebkitMarginAfterCollapse: 592 case CSSPropertyWebkitMarginAfterCollapse:
593 case CSSPropertyWebkitMarginBefore: 593 case CSSPropertyWebkitMarginBefore:
594 case CSSPropertyWebkitMarginBeforeCollapse: 594 case CSSPropertyWebkitMarginBeforeCollapse:
595 case CSSPropertyWebkitMarginBottomCollapse: 595 case CSSPropertyWebkitMarginBottomCollapse:
596 case CSSPropertyWebkitMarginCollapse: 596 case CSSPropertyWebkitMarginCollapse:
597 case CSSPropertyWebkitMarginEnd: 597 case CSSPropertyWebkitMarginEnd:
598 case CSSPropertyWebkitMarginStart: 598 case CSSPropertyWebkitMarginStart:
599 case CSSPropertyWebkitMarginTopCollapse: 599 case CSSPropertyWebkitMarginTopCollapse:
600 case CSSPropertyWebkitMarquee: 600 case CSSPropertyWebkitMarquee:
601 case CSSPropertyWebkitMarqueeDirection: 601 case CSSPropertyWebkitMarqueeDirection:
602 case CSSPropertyWebkitMarqueeIncrement: 602 case CSSPropertyWebkitMarqueeIncrement:
603 case CSSPropertyWebkitMarqueeRepetition: 603 case CSSPropertyWebkitMarqueeRepetition:
604 case CSSPropertyWebkitMarqueeSpeed: 604 case CSSPropertyWebkitMarqueeSpeed:
605 case CSSPropertyWebkitOrder: 605 case CSSPropertyOrder:
606 case CSSPropertyWebkitMarqueeStyle: 606 case CSSPropertyWebkitMarqueeStyle:
607 case CSSPropertyWebkitMask: 607 case CSSPropertyWebkitMask:
608 case CSSPropertyWebkitMaskBoxImage: 608 case CSSPropertyWebkitMaskBoxImage:
609 case CSSPropertyWebkitMaskBoxImageOutset: 609 case CSSPropertyWebkitMaskBoxImageOutset:
610 case CSSPropertyWebkitMaskBoxImageRepeat: 610 case CSSPropertyWebkitMaskBoxImageRepeat:
611 case CSSPropertyWebkitMaskBoxImageSlice: 611 case CSSPropertyWebkitMaskBoxImageSlice:
612 case CSSPropertyWebkitMaskBoxImageSource: 612 case CSSPropertyWebkitMaskBoxImageSource:
613 case CSSPropertyWebkitMaskBoxImageWidth: 613 case CSSPropertyWebkitMaskBoxImageWidth:
614 case CSSPropertyWebkitMaskClip: 614 case CSSPropertyWebkitMaskClip:
615 case CSSPropertyWebkitMaskComposite: 615 case CSSPropertyWebkitMaskComposite:
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
677 } 677 }
678 678
679 void CSSProperty::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const 679 void CSSProperty::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
680 { 680 {
681 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); 681 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);
682 info.addMember(m_value, "value"); 682 info.addMember(m_value, "value");
683 info.ignoreMember(m_metadata); 683 info.ignoreMember(m_metadata);
684 } 684 }
685 685
686 } // namespace WebCore 686 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/CSSProperties.in ('k') | Source/core/css/CSSPropertyNames.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698