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

Side by Side Diff: Source/core/frame/UseCounter.cpp

Issue 723373006: Add CSS parsing support for the scroll-blocks-on property (in place of touch-action-delay) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Apply CR feedback Created 6 years, 1 month 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/parser/CSSPropertyParser.cpp ('k') | Source/core/rendering/style/RenderStyle.h » ('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 /* 2 /*
3 * Copyright (C) 2012 Google, Inc. All rights reserved. 3 * Copyright (C) 2012 Google, Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after
477 case CSSPropertyAnimationTimingFunction: return 432; 477 case CSSPropertyAnimationTimingFunction: return 432;
478 case CSSPropertyObjectFit: return 433; 478 case CSSPropertyObjectFit: return 433;
479 case CSSPropertyPaintOrder: return 434; 479 case CSSPropertyPaintOrder: return 434;
480 case CSSPropertyMaskSourceType: return 435; 480 case CSSPropertyMaskSourceType: return 435;
481 case CSSPropertyIsolation: return 436; 481 case CSSPropertyIsolation: return 436;
482 case CSSPropertyObjectPosition: return 437; 482 case CSSPropertyObjectPosition: return 437;
483 // case CSSPropertyInternalCallback: return 438; 483 // case CSSPropertyInternalCallback: return 438;
484 case CSSPropertyShapeImageThreshold: return 439; 484 case CSSPropertyShapeImageThreshold: return 439;
485 case CSSPropertyColumnFill: return 440; 485 case CSSPropertyColumnFill: return 440;
486 case CSSPropertyTextJustify: return 441; 486 case CSSPropertyTextJustify: return 441;
487 case CSSPropertyTouchActionDelay: return 442; 487 // CSSPropertyTouchActionDelay was 442
488 case CSSPropertyJustifySelf: return 443; 488 case CSSPropertyJustifySelf: return 443;
489 case CSSPropertyScrollBehavior: return 444; 489 case CSSPropertyScrollBehavior: return 444;
490 case CSSPropertyWillChange: return 445; 490 case CSSPropertyWillChange: return 445;
491 case CSSPropertyTransform: return 446; 491 case CSSPropertyTransform: return 446;
492 case CSSPropertyTransformOrigin: return 447; 492 case CSSPropertyTransformOrigin: return 447;
493 case CSSPropertyTransformStyle: return 448; 493 case CSSPropertyTransformStyle: return 448;
494 case CSSPropertyPerspective: return 449; 494 case CSSPropertyPerspective: return 449;
495 case CSSPropertyPerspectiveOrigin: return 450; 495 case CSSPropertyPerspectiveOrigin: return 450;
496 case CSSPropertyBackfaceVisibility: return 451; 496 case CSSPropertyBackfaceVisibility: return 451;
497 case CSSPropertyGridTemplate: return 452; 497 case CSSPropertyGridTemplate: return 452;
498 case CSSPropertyGrid: return 453; 498 case CSSPropertyGrid: return 453;
499 case CSSPropertyAll: return 454; 499 case CSSPropertyAll: return 454;
500 case CSSPropertyJustifyItems: return 455; 500 case CSSPropertyJustifyItems: return 455;
501 case CSSPropertyScrollBlocksOn: return 456;
501 502
502 // 1. Add new features above this line (don't change the assigned numbers of the existing 503 // 1. Add new features above this line (don't change the assigned numbers of the existing
503 // items). 504 // items).
504 // 2. Update maximumCSSSampleId() with the new maximum value. 505 // 2. Update maximumCSSSampleId() with the new maximum value.
505 // 3. Run the update_use_counter_css.py script in 506 // 3. Run the update_use_counter_css.py script in
506 // chromium/src/tools/metrics/histograms to update the UMA histogram names. 507 // chromium/src/tools/metrics/histograms to update the UMA histogram names.
507 508
508 case CSSPropertyInvalid: 509 case CSSPropertyInvalid:
509 ASSERT_NOT_REACHED(); 510 ASSERT_NOT_REACHED();
510 return 0; 511 return 0;
511 } 512 }
512 513
513 ASSERT_NOT_REACHED(); 514 ASSERT_NOT_REACHED();
514 return 0; 515 return 0;
515 } 516 }
516 517
517 static int maximumCSSSampleId() { return 455; } 518 static int maximumCSSSampleId() { return 456; }
518 519
519 void UseCounter::muteForInspector() 520 void UseCounter::muteForInspector()
520 { 521 {
521 UseCounter::m_muteCount++; 522 UseCounter::m_muteCount++;
522 } 523 }
523 524
524 void UseCounter::unmuteForInspector() 525 void UseCounter::unmuteForInspector()
525 { 526 {
526 UseCounter::m_muteCount--; 527 UseCounter::m_muteCount--;
527 } 528 }
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
860 UseCounter* UseCounter::getFrom(const StyleSheetContents* sheetContents) 861 UseCounter* UseCounter::getFrom(const StyleSheetContents* sheetContents)
861 { 862 {
862 // FIXME: We may want to handle stylesheets that have multiple owners 863 // FIXME: We may want to handle stylesheets that have multiple owners
863 // http://crbug.com/242125 864 // http://crbug.com/242125
864 if (sheetContents && sheetContents->hasSingleOwnerNode()) 865 if (sheetContents && sheetContents->hasSingleOwnerNode())
865 return getFrom(sheetContents->singleOwnerDocument()); 866 return getFrom(sheetContents->singleOwnerDocument());
866 return 0; 867 return 0;
867 } 868 }
868 869
869 } // namespace blink 870 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/parser/CSSPropertyParser.cpp ('k') | Source/core/rendering/style/RenderStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698