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

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

Issue 1194963002: Add PermissionStatus.state and deprecate PermissionStatus.status. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: use DeprecateAs Created 5 years, 5 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/frame/UseCounter.h ('k') | Source/modules/permissions/PermissionStatus.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 * Copyright (C) 2012 Google, Inc. All rights reserved. 2 * Copyright (C) 2012 Google, Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 929 matching lines...) Expand 10 before | Expand all | Expand 10 after
940 940
941 case MediaStreamLabel: 941 case MediaStreamLabel:
942 return "'MediaStream.label' is deprecated and will be removed in M47, ar ound November 2015. Please use 'MediaStream.id' instead."; 942 return "'MediaStream.label' is deprecated and will be removed in M47, ar ound November 2015. Please use 'MediaStream.id' instead.";
943 943
944 case MediaStreamStop: 944 case MediaStreamStop:
945 return "'MediaStream.stop()' is deprecated and will be removed in M47, a round November 2015. Please use 'MediaStream.active' instead."; 945 return "'MediaStream.stop()' is deprecated and will be removed in M47, a round November 2015. Please use 'MediaStream.active' instead.";
946 946
947 case MediaStreamEnded: 947 case MediaStreamEnded:
948 return "'MediaStream.ended' is deprecated and will be removed in M47, ar ound November 2015. Please use 'MediaStream.active' instead."; 948 return "'MediaStream.ended' is deprecated and will be removed in M47, ar ound November 2015. Please use 'MediaStream.active' instead.";
949 949
950 case PermissionStatusStatus:
951 return "PermissionStatus.status is deprecated and will be removed in M47 , around November 2015. Please use PermissionStatus.state instead.";
952
950 // Features that aren't deprecated don't have a deprecation message. 953 // Features that aren't deprecated don't have a deprecation message.
951 default: 954 default:
952 return String(); 955 return String();
953 } 956 }
954 } 957 }
955 958
956 void UseCounter::count(CSSParserContext context, CSSPropertyID feature) 959 void UseCounter::count(CSSParserContext context, CSSPropertyID feature)
957 { 960 {
958 ASSERT(feature >= firstCSSProperty); 961 ASSERT(feature >= firstCSSProperty);
959 ASSERT(feature <= lastUnresolvedCSSProperty); 962 ASSERT(feature <= lastUnresolvedCSSProperty);
(...skipping 27 matching lines...) Expand all
987 UseCounter* UseCounter::getFrom(const StyleSheetContents* sheetContents) 990 UseCounter* UseCounter::getFrom(const StyleSheetContents* sheetContents)
988 { 991 {
989 // FIXME: We may want to handle stylesheets that have multiple owners 992 // FIXME: We may want to handle stylesheets that have multiple owners
990 // http://crbug.com/242125 993 // http://crbug.com/242125
991 if (sheetContents && sheetContents->hasSingleOwnerNode()) 994 if (sheetContents && sheetContents->hasSingleOwnerNode())
992 return getFrom(sheetContents->singleOwnerDocument()); 995 return getFrom(sheetContents->singleOwnerDocument());
993 return 0; 996 return 0;
994 } 997 }
995 998
996 } // namespace blink 999 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/UseCounter.h ('k') | Source/modules/permissions/PermissionStatus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698