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

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

Issue 25687002: Add support for the column-fill property. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Put changes to problematic files (for the bots) back in. Created 7 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
« no previous file with comments | « Source/core/page/RuntimeEnabledFeatures.in ('k') | Source/core/rendering/RenderBlock.cpp » ('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 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 case CSSPropertyAnimationName: return 430; 488 case CSSPropertyAnimationName: return 430;
489 case CSSPropertyAnimationPlayState: return 431; 489 case CSSPropertyAnimationPlayState: return 431;
490 case CSSPropertyAnimationTimingFunction: return 432; 490 case CSSPropertyAnimationTimingFunction: return 432;
491 case CSSPropertyObjectFit: return 433; 491 case CSSPropertyObjectFit: return 433;
492 case CSSPropertyPaintOrder: return 434; 492 case CSSPropertyPaintOrder: return 434;
493 case CSSPropertyMaskSourceType: return 435; 493 case CSSPropertyMaskSourceType: return 435;
494 case CSSPropertyIsolation: return 436; 494 case CSSPropertyIsolation: return 436;
495 case CSSPropertyObjectPosition: return 437; 495 case CSSPropertyObjectPosition: return 437;
496 case CSSPropertyInternalCallback: return 438; 496 case CSSPropertyInternalCallback: return 438;
497 case CSSPropertyWebkitShapeImageThreshold: return 439; 497 case CSSPropertyWebkitShapeImageThreshold: return 439;
498 case CSSPropertyColumnFill: return 440;
498 499
499 // Add new features above this line (don't change the assigned numbers of th e existing 500 // Add new features above this line (don't change the assigned numbers of th e existing
500 // items) and update maximumCSSSampleId() with the new maximum value. 501 // items) and update maximumCSSSampleId() with the new maximum value.
501 502
502 // Internal properties should not be counted. 503 // Internal properties should not be counted.
503 case CSSPropertyInternalMarqueeDirection: 504 case CSSPropertyInternalMarqueeDirection:
504 case CSSPropertyInternalMarqueeIncrement: 505 case CSSPropertyInternalMarqueeIncrement:
505 case CSSPropertyInternalMarqueeRepetition: 506 case CSSPropertyInternalMarqueeRepetition:
506 case CSSPropertyInternalMarqueeSpeed: 507 case CSSPropertyInternalMarqueeSpeed:
507 case CSSPropertyInternalMarqueeStyle: 508 case CSSPropertyInternalMarqueeStyle:
508 case CSSPropertyInvalid: 509 case CSSPropertyInvalid:
509 case CSSPropertyVariable: 510 case CSSPropertyVariable:
510 ASSERT_NOT_REACHED(); 511 ASSERT_NOT_REACHED();
511 return 0; 512 return 0;
512 } 513 }
513 514
514 ASSERT_NOT_REACHED(); 515 ASSERT_NOT_REACHED();
515 return 0; 516 return 0;
516 } 517 }
517 518
518 static int maximumCSSSampleId() { return 439; } 519 static int maximumCSSSampleId() { return 440; }
519 520
520 UseCounter::UseCounter() 521 UseCounter::UseCounter()
521 { 522 {
522 m_CSSFeatureBits.ensureSize(lastCSSProperty + 1); 523 m_CSSFeatureBits.ensureSize(lastCSSProperty + 1);
523 m_CSSFeatureBits.clearAll(); 524 m_CSSFeatureBits.clearAll();
524 } 525 }
525 526
526 UseCounter::~UseCounter() 527 UseCounter::~UseCounter()
527 { 528 {
528 // We always log PageDestruction so that we have a scale for the rest of the features. 529 // We always log PageDestruction so that we have a scale for the rest of the features.
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
718 UseCounter* UseCounter::getFrom(const StyleSheetContents* sheetContents) 719 UseCounter* UseCounter::getFrom(const StyleSheetContents* sheetContents)
719 { 720 {
720 // FIXME: We may want to handle stylesheets that have multiple owners 721 // FIXME: We may want to handle stylesheets that have multiple owners
721 // http://crbug.com/242125 722 // http://crbug.com/242125
722 if (sheetContents && !sheetContents->isUserStyleSheet() && sheetContents->ha sSingleOwnerNode()) 723 if (sheetContents && !sheetContents->isUserStyleSheet() && sheetContents->ha sSingleOwnerNode())
723 return getFrom(sheetContents->singleOwnerDocument()); 724 return getFrom(sheetContents->singleOwnerDocument());
724 return 0; 725 return 0;
725 } 726 }
726 727
727 } // namespace WebCore 728 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/page/RuntimeEnabledFeatures.in ('k') | Source/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698