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

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

Issue 1084683003: Merge the value of the push subscription id into the endpoint. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 5 years, 7 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/frame/UseCounter.h ('k') | Source/modules/push_messaging/PushSubscription.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 894 matching lines...) Expand 10 before | Expand all | Expand 10 after
905 905
906 case DeviceMotionInsecureOrigin: 906 case DeviceMotionInsecureOrigin:
907 return "The 'devicemotion' event will be deprecated over insecure origin s in the future. You should consider switching your application to a secure orig in, such as HTTPS. See https://goo.gl/rStTGz for more details."; 907 return "The 'devicemotion' event will be deprecated over insecure origin s in the future. You should consider switching your application to a secure orig in, such as HTTPS. See https://goo.gl/rStTGz for more details.";
908 908
909 case DeviceOrientationInsecureOrigin: 909 case DeviceOrientationInsecureOrigin:
910 return "The 'deviceorientation' event will be deprecated over insecure o rigins in the future. You should consider switching your application to a secure origin, such as HTTPS. See https://goo.gl/rStTGz for more details."; 910 return "The 'deviceorientation' event will be deprecated over insecure o rigins in the future. You should consider switching your application to a secure origin, such as HTTPS. See https://goo.gl/rStTGz for more details.";
911 911
912 case FullscreenInsecureOrigin: 912 case FullscreenInsecureOrigin:
913 return "requestFullscreen() will be deprecated over insecure origins in the future. You should consider switching your application to a secure origin, s uch as HTTPS. See https://goo.gl/rStTGz for more details."; 913 return "requestFullscreen() will be deprecated over insecure origins in the future. You should consider switching your application to a secure origin, s uch as HTTPS. See https://goo.gl/rStTGz for more details.";
914 914
915 case PushSubscriptionId:
916 return "'PushSubscription.subscriptionId' is deprecated and is now inclu ded in 'PushSubscription.endpoint'. It will be removed in Chrome 45, around Augu st 2015.";
917
915 // Features that aren't deprecated don't have a deprecation message. 918 // Features that aren't deprecated don't have a deprecation message.
916 default: 919 default:
917 return String(); 920 return String();
918 } 921 }
919 } 922 }
920 923
921 void UseCounter::count(CSSParserContext context, CSSPropertyID feature) 924 void UseCounter::count(CSSParserContext context, CSSPropertyID feature)
922 { 925 {
923 ASSERT(feature >= firstCSSProperty); 926 ASSERT(feature >= firstCSSProperty);
924 ASSERT(feature <= lastUnresolvedCSSProperty); 927 ASSERT(feature <= lastUnresolvedCSSProperty);
(...skipping 27 matching lines...) Expand all
952 UseCounter* UseCounter::getFrom(const StyleSheetContents* sheetContents) 955 UseCounter* UseCounter::getFrom(const StyleSheetContents* sheetContents)
953 { 956 {
954 // FIXME: We may want to handle stylesheets that have multiple owners 957 // FIXME: We may want to handle stylesheets that have multiple owners
955 // http://crbug.com/242125 958 // http://crbug.com/242125
956 if (sheetContents && sheetContents->hasSingleOwnerNode()) 959 if (sheetContents && sheetContents->hasSingleOwnerNode())
957 return getFrom(sheetContents->singleOwnerDocument()); 960 return getFrom(sheetContents->singleOwnerDocument());
958 return 0; 961 return 0;
959 } 962 }
960 963
961 } // namespace blink 964 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/UseCounter.h ('k') | Source/modules/push_messaging/PushSubscription.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698