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

Side by Side Diff: third_party/WebKit/Source/core/frame/Deprecation.cpp

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "core/frame/Deprecation.h" 5 #include "core/frame/Deprecation.h"
6 6
7 #include "core/dom/Document.h" 7 #include "core/dom/Document.h"
8 #include "core/dom/ExecutionContext.h" 8 #include "core/dom/ExecutionContext.h"
9 #include "core/frame/FrameConsole.h" 9 #include "core/frame/FrameConsole.h"
10 #include "core/frame/FrameHost.h" 10 #include "core/frame/FrameHost.h"
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 return; 147 return;
148 Deprecation::countDeprecation(context, feature); 148 Deprecation::countDeprecation(context, feature);
149 } 149 }
150 150
151 void Deprecation::countDeprecationCrossOriginIframe(const Document& document, Us eCounter::Feature feature) 151 void Deprecation::countDeprecationCrossOriginIframe(const Document& document, Us eCounter::Feature feature)
152 { 152 {
153 LocalFrame* frame = document.frame(); 153 LocalFrame* frame = document.frame();
154 if (!frame) 154 if (!frame)
155 return; 155 return;
156 // Check to see if the frame can script into the top level document. 156 // Check to see if the frame can script into the top level document.
157 SecurityOrigin* securityOrigin = frame->securityContext()->securityOrigin(); 157 SecurityOrigin* securityOrigin = frame->securityContext()->getSecurityOrigin ();
158 Frame* top = frame->tree().top(); 158 Frame* top = frame->tree().top();
159 if (top && !securityOrigin->canAccess(top->securityContext()->securityOrigin ())) 159 if (top && !securityOrigin->canAccess(top->securityContext()->getSecurityOri gin()))
160 countDeprecation(frame, feature); 160 countDeprecation(frame, feature);
161 } 161 }
162 162
163 String Deprecation::deprecationMessage(UseCounter::Feature feature) 163 String Deprecation::deprecationMessage(UseCounter::Feature feature)
164 { 164 {
165 switch (feature) { 165 switch (feature) {
166 // Quota 166 // Quota
167 case UseCounter::PrefixedStorageInfo: 167 case UseCounter::PrefixedStorageInfo:
168 return replacedBy("'window.webkitStorageInfo'", "'navigator.webkitTempor aryStorage' or 'navigator.webkitPersistentStorage'"); 168 return replacedBy("'window.webkitStorageInfo'", "'navigator.webkitTempor aryStorage' or 'navigator.webkitPersistentStorage'");
169 169
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 case UseCounter::ResultsAttribute: 368 case UseCounter::ResultsAttribute:
369 return willBeRemoved("'results' attribute", 53, "5738199536107520"); 369 return willBeRemoved("'results' attribute", 53, "5738199536107520");
370 370
371 // Features that aren't deprecated don't have a deprecation message. 371 // Features that aren't deprecated don't have a deprecation message.
372 default: 372 default:
373 return String(); 373 return String();
374 } 374 }
375 } 375 }
376 376
377 } // namespace blink 377 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/DOMWindowTimers.cpp ('k') | third_party/WebKit/Source/core/frame/Frame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698