| 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 2bdcf73100c2e1f7f76b8635758f3d124013f158..9b5c49426203782541aad1cab0a986145f2d2d69 100644
|
| --- a/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp
|
| +++ b/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp
|
| @@ -111,11 +111,11 @@ static void FEATURE1_RUNTIME_AND_EXPERIMENT_ENABLED_CONST1ConstantGetterCallback
|
| ExecutionContext* executionContext = currentExecutionContext(info.GetIsolate());
|
| String memberErrorMessage;
|
| if (!OriginTrials::featureName1Enabled(executionContext, memberErrorMessage)) {
|
| - v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
|
| - if (!memberErrorMessage.isEmpty()) {
|
| - toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
|
| - }
|
| - return;
|
| + v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
|
| + if (!memberErrorMessage.isEmpty()) {
|
| + toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
|
| + }
|
| + return;
|
| }
|
| v8SetReturnValueInt(info, 1);
|
| }
|
| @@ -125,11 +125,11 @@ static void FEATURE1_RUNTIME_AND_EXPERIMENT_ENABLED_CONST2ConstantGetterCallback
|
| ExecutionContext* executionContext = currentExecutionContext(info.GetIsolate());
|
| String memberErrorMessage;
|
| if (!OriginTrials::featureName1Enabled(executionContext, memberErrorMessage)) {
|
| - v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
|
| - if (!memberErrorMessage.isEmpty()) {
|
| - toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
|
| - }
|
| - return;
|
| + v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
|
| + if (!memberErrorMessage.isEmpty()) {
|
| + toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
|
| + }
|
| + return;
|
| }
|
| v8SetReturnValueInt(info, 2);
|
| }
|
| @@ -139,11 +139,11 @@ static void FEATURE2_RUNTIME_AND_EXPERIMENT_ENABLED_CONST1ConstantGetterCallback
|
| ExecutionContext* executionContext = currentExecutionContext(info.GetIsolate());
|
| String memberErrorMessage;
|
| if (!OriginTrials::featureName2Enabled(executionContext, memberErrorMessage)) {
|
| - v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
|
| - if (!memberErrorMessage.isEmpty()) {
|
| - toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
|
| - }
|
| - return;
|
| + v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
|
| + if (!memberErrorMessage.isEmpty()) {
|
| + toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
|
| + }
|
| + return;
|
| }
|
| v8SetReturnValueInt(info, 3);
|
| }
|
| @@ -153,11 +153,11 @@ static void FEATURE2_RUNTIME_AND_EXPERIMENT_ENABLED_CONST2ConstantGetterCallback
|
| ExecutionContext* executionContext = currentExecutionContext(info.GetIsolate());
|
| String memberErrorMessage;
|
| if (!OriginTrials::featureName2Enabled(executionContext, memberErrorMessage)) {
|
| - v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
|
| - if (!memberErrorMessage.isEmpty()) {
|
| - toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
|
| - }
|
| - return;
|
| + v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
|
| + if (!memberErrorMessage.isEmpty()) {
|
| + toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
|
| + }
|
| + return;
|
| }
|
| v8SetReturnValueInt(info, 4);
|
| }
|
| @@ -167,11 +167,11 @@ static void FEATURE3_RUNTIME_AND_EXPERIMENT_ENABLED_CONST1ConstantGetterCallback
|
| ExecutionContext* executionContext = currentExecutionContext(info.GetIsolate());
|
| String memberErrorMessage;
|
| if (!OriginTrials::featureName3Enabled(executionContext, memberErrorMessage)) {
|
| - v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
|
| - if (!memberErrorMessage.isEmpty()) {
|
| - toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
|
| - }
|
| - return;
|
| + v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
|
| + if (!memberErrorMessage.isEmpty()) {
|
| + toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
|
| + }
|
| + return;
|
| }
|
| v8SetReturnValueInt(info, 5);
|
| }
|
| @@ -2505,11 +2505,11 @@ static void experimentRuntimeEnabledLongAttributeAttributeGetter(const v8::Funct
|
| ExecutionContext* executionContext = currentExecutionContext(info.GetIsolate());
|
| String memberErrorMessage;
|
| if (!OriginTrials::featureNameEnabled(executionContext, memberErrorMessage)) {
|
| - v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
|
| - if (!memberErrorMessage.isEmpty()) {
|
| - toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
|
| - }
|
| - return;
|
| + v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
|
| + if (!memberErrorMessage.isEmpty()) {
|
| + toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
|
| + }
|
| + return;
|
| }
|
| v8::Local<v8::Object> holder = info.Holder();
|
| TestObject* impl = V8TestObject::toImpl(holder);
|
| @@ -2521,11 +2521,11 @@ static void experimentRuntimeEnabledLongAttributeAttributeGetterCallback(const v
|
| ExecutionContext* executionContext = currentExecutionContext(info.GetIsolate());
|
| String memberErrorMessage;
|
| if (!OriginTrials::featureNameEnabled(executionContext, memberErrorMessage)) {
|
| - v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
|
| - if (!memberErrorMessage.isEmpty()) {
|
| - toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
|
| - }
|
| - return;
|
| + v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
|
| + if (!memberErrorMessage.isEmpty()) {
|
| + toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
|
| + }
|
| + return;
|
| }
|
| TestObjectV8Internal::experimentRuntimeEnabledLongAttributeAttributeGetter(info);
|
| }
|
| @@ -4526,11 +4526,11 @@ static void unscopeableExperimentEnabledLongAttributeAttributeGetter(const v8::F
|
| ExecutionContext* executionContext = currentExecutionContext(info.GetIsolate());
|
| String memberErrorMessage;
|
| if (!OriginTrials::featureNameEnabled(executionContext, memberErrorMessage)) {
|
| - v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
|
| - if (!memberErrorMessage.isEmpty()) {
|
| - toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
|
| - }
|
| - return;
|
| + v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
|
| + if (!memberErrorMessage.isEmpty()) {
|
| + toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
|
| + }
|
| + return;
|
| }
|
| v8::Local<v8::Object> holder = info.Holder();
|
| TestObject* impl = V8TestObject::toImpl(holder);
|
| @@ -4542,11 +4542,11 @@ static void unscopeableExperimentEnabledLongAttributeAttributeGetterCallback(con
|
| ExecutionContext* executionContext = currentExecutionContext(info.GetIsolate());
|
| String memberErrorMessage;
|
| if (!OriginTrials::featureNameEnabled(executionContext, memberErrorMessage)) {
|
| - v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
|
| - if (!memberErrorMessage.isEmpty()) {
|
| - toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
|
| - }
|
| - return;
|
| + v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
|
| + if (!memberErrorMessage.isEmpty()) {
|
| + toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
|
| + }
|
| + return;
|
| }
|
| TestObjectV8Internal::unscopeableExperimentEnabledLongAttributeAttributeGetter(info);
|
| }
|
| @@ -9303,11 +9303,11 @@ static void experimentEnabledVoidMethodMethodCallback(const v8::FunctionCallback
|
| ExecutionContext* executionContext = currentExecutionContext(info.GetIsolate());
|
| String memberErrorMessage;
|
| if (!OriginTrials::featureName1Enabled(executionContext, memberErrorMessage)) {
|
| - v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
|
| - if (!memberErrorMessage.isEmpty()) {
|
| - toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
|
| - }
|
| - return;
|
| + v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
|
| + if (!memberErrorMessage.isEmpty()) {
|
| + toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
|
| + }
|
| + return;
|
| }
|
| TestObjectV8Internal::experimentEnabledVoidMethodMethod(info);
|
| }
|
| @@ -9323,11 +9323,11 @@ static void perWorldBindingsExperimentEnabledVoidMethodMethodCallback(const v8::
|
| ExecutionContext* executionContext = currentExecutionContext(info.GetIsolate());
|
| String memberErrorMessage;
|
| if (!OriginTrials::featureName1Enabled(executionContext, memberErrorMessage)) {
|
| - v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
|
| - if (!memberErrorMessage.isEmpty()) {
|
| - toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
|
| - }
|
| - return;
|
| + v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
|
| + if (!memberErrorMessage.isEmpty()) {
|
| + toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
|
| + }
|
| + return;
|
| }
|
| TestObjectV8Internal::perWorldBindingsExperimentEnabledVoidMethodMethod(info);
|
| }
|
| @@ -9343,11 +9343,11 @@ static void perWorldBindingsExperimentEnabledVoidMethodMethodCallbackForMainWorl
|
| ExecutionContext* executionContext = currentExecutionContext(info.GetIsolate());
|
| String memberErrorMessage;
|
| if (!OriginTrials::featureName1Enabled(executionContext, memberErrorMessage)) {
|
| - v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
|
| - if (!memberErrorMessage.isEmpty()) {
|
| - toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
|
| - }
|
| - return;
|
| + v8SetReturnValue(info, v8::Undefined(info.GetIsolate()));
|
| + if (!memberErrorMessage.isEmpty()) {
|
| + toDocument(executionContext)->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, memberErrorMessage));
|
| + }
|
| + return;
|
| }
|
| TestObjectV8Internal::perWorldBindingsExperimentEnabledVoidMethodMethodForMainWorld(info);
|
| }
|
|
|