Index: third_party/WebKit/Source/core/frame/Deprecation.cpp |
diff --git a/third_party/WebKit/Source/core/frame/Deprecation.cpp b/third_party/WebKit/Source/core/frame/Deprecation.cpp |
index efb187442bb94dd1a88bd5f72d20725e266bc7cf..c55347d60e85ede6251e187715949af2fc148132 100644 |
--- a/third_party/WebKit/Source/core/frame/Deprecation.cpp |
+++ b/third_party/WebKit/Source/core/frame/Deprecation.cpp |
@@ -148,11 +148,8 @@ void Deprecation::countDeprecationIfNotPrivateScript(v8::Isolate* isolate, Execu |
Deprecation::countDeprecation(context, feature); |
} |
-void Deprecation::countDeprecationCrossOriginIframe(const Document& document, UseCounter::Feature feature) |
+void Deprecation::countDeprecationCrossOriginIframe(const LocalFrame* frame, UseCounter::Feature feature) |
{ |
- LocalFrame* frame = document.frame(); |
- if (!frame) |
- return; |
// Check to see if the frame can script into the top level document. |
SecurityOrigin* securityOrigin = frame->securityContext()->getSecurityOrigin(); |
Frame* top = frame->tree().top(); |
@@ -160,6 +157,14 @@ void Deprecation::countDeprecationCrossOriginIframe(const Document& document, Us |
countDeprecation(frame, feature); |
} |
+void Deprecation::countDeprecationCrossOriginIframe(const Document& document, UseCounter::Feature feature) |
+{ |
+ LocalFrame* frame = document.frame(); |
+ if (!frame) |
+ return; |
+ countDeprecationCrossOriginIframe(frame, feature); |
+} |
+ |
String Deprecation::deprecationMessage(UseCounter::Feature feature) |
{ |
switch (feature) { |
@@ -362,6 +367,9 @@ String Deprecation::deprecationMessage(UseCounter::Feature feature) |
case UseCounter::ResultsAttribute: |
return willBeRemoved("'results' attribute", 53, "5738199536107520"); |
+ case UseCounter::TouchDragUserGestureUsedCrossOrigin: |
+ return willBeRemoved("Performing sensitive operations in iframes on touch events which don't represent a tap gesture", 52, "https://www.chromestatus.com/features/5649871251963904"); |
+ |
// Features that aren't deprecated don't have a deprecation message. |
default: |
return String(); |