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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp

Issue 1861433002: Make [OriginTrialEnabled] and [RuntimeEnabled] mutually exclusive (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@586594-separate-tests
Patch Set: Clean up commented code Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
« third_party/WebKit/Source/bindings/tests/results/core/V8TestInterface2.cpp ('K') | « third_party/WebKit/Source/bindings/tests/results/core/V8TestInterface2.cpp ('k') | third_party/WebKit/Source/core/origin_trials/testing/InternalsFrobulate.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp
diff --git a/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp b/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp
index 9dc2f004baa7fecc9e4714bd69808075f6861bf6..f6b14335da6d60500c70b131163816fe67963ba4 100644
--- a/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp
+++ b/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp
@@ -109,11 +109,11 @@ static void MEASURED_CONSTANTConstantGetterCallback(v8::Local<v8::Name>, const v
static void FEATURE1_ORIGIN_TRIAL_ENABLED_CONST1ConstantGetterCallback(v8::Local<v8::Name>, const v8::PropertyCallbackInfo<v8::Value>& info)
{
ExecutionContext* executionContext = currentExecutionContext(info.GetIsolate());
- String memberErrorMessage;
- if (!OriginTrials::featureName1Enabled(executionContext, memberErrorMessage)) {
+ String errorMessage;
+ if (!OriginTrials::featureName1Enabled(executionContext, errorMessage)) {
v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
- if (!memberErrorMessage.isEmpty()) {
- toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
+ if (!errorMessage.isEmpty()) {
+ toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, errorMessage));
}
return;
}
@@ -123,11 +123,11 @@ static void FEATURE1_ORIGIN_TRIAL_ENABLED_CONST1ConstantGetterCallback(v8::Local
static void FEATURE1_ORIGIN_TRIAL_ENABLED_CONST2ConstantGetterCallback(v8::Local<v8::Name>, const v8::PropertyCallbackInfo<v8::Value>& info)
{
ExecutionContext* executionContext = currentExecutionContext(info.GetIsolate());
- String memberErrorMessage;
- if (!OriginTrials::featureName1Enabled(executionContext, memberErrorMessage)) {
+ String errorMessage;
+ if (!OriginTrials::featureName1Enabled(executionContext, errorMessage)) {
v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
- if (!memberErrorMessage.isEmpty()) {
- toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
+ if (!errorMessage.isEmpty()) {
+ toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, errorMessage));
}
return;
}
@@ -137,11 +137,11 @@ static void FEATURE1_ORIGIN_TRIAL_ENABLED_CONST2ConstantGetterCallback(v8::Local
static void FEATURE2_ORIGIN_TRIAL_ENABLED_CONST1ConstantGetterCallback(v8::Local<v8::Name>, const v8::PropertyCallbackInfo<v8::Value>& info)
{
ExecutionContext* executionContext = currentExecutionContext(info.GetIsolate());
- String memberErrorMessage;
- if (!OriginTrials::featureName2Enabled(executionContext, memberErrorMessage)) {
+ String errorMessage;
+ if (!OriginTrials::featureName2Enabled(executionContext, errorMessage)) {
v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
- if (!memberErrorMessage.isEmpty()) {
- toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
+ if (!errorMessage.isEmpty()) {
+ toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, errorMessage));
}
return;
}
@@ -151,11 +151,11 @@ static void FEATURE2_ORIGIN_TRIAL_ENABLED_CONST1ConstantGetterCallback(v8::Local
static void FEATURE2_ORIGIN_TRIAL_ENABLED_CONST2ConstantGetterCallback(v8::Local<v8::Name>, const v8::PropertyCallbackInfo<v8::Value>& info)
{
ExecutionContext* executionContext = currentExecutionContext(info.GetIsolate());
- String memberErrorMessage;
- if (!OriginTrials::featureName2Enabled(executionContext, memberErrorMessage)) {
+ String errorMessage;
+ if (!OriginTrials::featureName2Enabled(executionContext, errorMessage)) {
v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
- if (!memberErrorMessage.isEmpty()) {
- toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
+ if (!errorMessage.isEmpty()) {
+ toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, errorMessage));
}
return;
}
@@ -165,11 +165,11 @@ static void FEATURE2_ORIGIN_TRIAL_ENABLED_CONST2ConstantGetterCallback(v8::Local
static void FEATURE3_ORIGIN_TRIAL_ENABLED_CONST1ConstantGetterCallback(v8::Local<v8::Name>, const v8::PropertyCallbackInfo<v8::Value>& info)
{
ExecutionContext* executionContext = currentExecutionContext(info.GetIsolate());
- String memberErrorMessage;
- if (!OriginTrials::featureName3Enabled(executionContext, memberErrorMessage)) {
+ String errorMessage;
+ if (!OriginTrials::featureName3Enabled(executionContext, errorMessage)) {
v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
- if (!memberErrorMessage.isEmpty()) {
- toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
+ if (!errorMessage.isEmpty()) {
+ toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, errorMessage));
}
return;
}
@@ -2643,11 +2643,11 @@ static void notEnumerableLongAttributeAttributeSetterCallback(const v8::Function
static void originTrialEnabledLongAttributeAttributeGetter(const v8::FunctionCallbackInfo<v8::Value>& info)
{
ExecutionContext* executionContext = currentExecutionContext(info.GetIsolate());
- String memberErrorMessage;
- if (!OriginTrials::featureNameEnabled(executionContext, memberErrorMessage)) {
+ String errorMessage;
+ if (!OriginTrials::featureNameEnabled(executionContext, errorMessage)) {
v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
- if (!memberErrorMessage.isEmpty()) {
- toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
+ if (!errorMessage.isEmpty()) {
+ toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, errorMessage));
}
return;
}
@@ -2659,11 +2659,11 @@ static void originTrialEnabledLongAttributeAttributeGetter(const v8::FunctionCal
static void originTrialEnabledLongAttributeAttributeGetterCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
{
ExecutionContext* executionContext = currentExecutionContext(info.GetIsolate());
- String memberErrorMessage;
- if (!OriginTrials::featureNameEnabled(executionContext, memberErrorMessage)) {
+ String errorMessage;
+ if (!OriginTrials::featureNameEnabled(executionContext, errorMessage)) {
v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
- if (!memberErrorMessage.isEmpty()) {
- toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
+ if (!errorMessage.isEmpty()) {
+ toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, errorMessage));
}
return;
}
@@ -4524,11 +4524,11 @@ static void unscopeableLongAttributeAttributeSetterCallback(const v8::FunctionCa
static void unscopeableOriginTrialEnabledLongAttributeAttributeGetter(const v8::FunctionCallbackInfo<v8::Value>& info)
{
ExecutionContext* executionContext = currentExecutionContext(info.GetIsolate());
- String memberErrorMessage;
- if (!OriginTrials::featureNameEnabled(executionContext, memberErrorMessage)) {
+ String errorMessage;
+ if (!OriginTrials::featureNameEnabled(executionContext, errorMessage)) {
v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
- if (!memberErrorMessage.isEmpty()) {
- toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
+ if (!errorMessage.isEmpty()) {
+ toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, errorMessage));
}
return;
}
@@ -4540,11 +4540,11 @@ static void unscopeableOriginTrialEnabledLongAttributeAttributeGetter(const v8::
static void unscopeableOriginTrialEnabledLongAttributeAttributeGetterCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
{
ExecutionContext* executionContext = currentExecutionContext(info.GetIsolate());
- String memberErrorMessage;
- if (!OriginTrials::featureNameEnabled(executionContext, memberErrorMessage)) {
+ String errorMessage;
+ if (!OriginTrials::featureNameEnabled(executionContext, errorMessage)) {
v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
- if (!memberErrorMessage.isEmpty()) {
- toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
+ if (!errorMessage.isEmpty()) {
+ toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, errorMessage));
}
return;
}
@@ -9750,11 +9750,11 @@ static void originTrialEnabledVoidMethodMethod(const v8::FunctionCallbackInfo<v8
static void originTrialEnabledVoidMethodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
{
ExecutionContext* executionContext = currentExecutionContext(info.GetIsolate());
- String memberErrorMessage;
- if (!OriginTrials::featureName1Enabled(executionContext, memberErrorMessage)) {
+ String errorMessage;
+ if (!OriginTrials::featureNameEnabled(executionContext, errorMessage)) {
v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
- if (!memberErrorMessage.isEmpty()) {
- toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
+ if (!errorMessage.isEmpty()) {
+ toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, errorMessage));
}
return;
}
@@ -9770,11 +9770,11 @@ static void perWorldBindingsOriginTrialEnabledVoidMethodMethod(const v8::Functio
static void perWorldBindingsOriginTrialEnabledVoidMethodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
{
ExecutionContext* executionContext = currentExecutionContext(info.GetIsolate());
- String memberErrorMessage;
- if (!OriginTrials::featureName1Enabled(executionContext, memberErrorMessage)) {
+ String errorMessage;
+ if (!OriginTrials::featureNameEnabled(executionContext, errorMessage)) {
v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
- if (!memberErrorMessage.isEmpty()) {
- toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
+ if (!errorMessage.isEmpty()) {
+ toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, errorMessage));
}
return;
}
@@ -9790,11 +9790,11 @@ static void perWorldBindingsOriginTrialEnabledVoidMethodMethodForMainWorld(const
static void perWorldBindingsOriginTrialEnabledVoidMethodMethodCallbackForMainWorld(const v8::FunctionCallbackInfo<v8::Value>& info)
{
ExecutionContext* executionContext = currentExecutionContext(info.GetIsolate());
- String memberErrorMessage;
- if (!OriginTrials::featureName1Enabled(executionContext, memberErrorMessage)) {
+ String errorMessage;
+ if (!OriginTrials::featureNameEnabled(executionContext, errorMessage)) {
v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
- if (!memberErrorMessage.isEmpty()) {
- toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
+ if (!errorMessage.isEmpty()) {
+ toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, errorMessage));
}
return;
}
« third_party/WebKit/Source/bindings/tests/results/core/V8TestInterface2.cpp ('K') | « third_party/WebKit/Source/bindings/tests/results/core/V8TestInterface2.cpp ('k') | third_party/WebKit/Source/core/origin_trials/testing/InternalsFrobulate.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698