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

Side by Side Diff: third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp

Issue 2123323004: Simplify OriginTrialContext and the way it validates tokens. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: mark enum as obsolete Created 4 years, 5 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 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 812 matching lines...) Expand 10 before | Expand all | Expand 10 after
823 ExecutionContext* executionContext = toExecutionContext(context); 823 ExecutionContext* executionContext = toExecutionContext(context);
824 OriginTrialContext* originTrialContext = OriginTrialContext::from(executionC ontext, OriginTrialContext::DontCreateIfNotExists); 824 OriginTrialContext* originTrialContext = OriginTrialContext::from(executionC ontext, OriginTrialContext::DontCreateIfNotExists);
825 if (!originTrialContext) 825 if (!originTrialContext)
826 return; 826 return;
827 827
828 ScriptState::Scope scope(scriptState); 828 ScriptState::Scope scope(scriptState);
829 829
830 (*s_installOriginTrialsFunction)(scriptState); 830 (*s_installOriginTrialsFunction)(scriptState);
831 831
832 // Mark each enabled feature as having been installed. 832 // Mark each enabled feature as having been installed.
833 if (!originTrialContext->featureBindingsInstalled("DurableStorage") && (Runt imeEnabledFeatures::durableStorageEnabled() || originTrialContext->isFeatureEnab led("DurableStorage", nullptr))) { 833 if (!originTrialContext->featureBindingsInstalled("DurableStorage") && (Runt imeEnabledFeatures::durableStorageEnabled() || originTrialContext->isFeatureEnab led("DurableStorage"))) {
834 originTrialContext->setFeatureBindingsInstalled("DurableStorage"); 834 originTrialContext->setFeatureBindingsInstalled("DurableStorage");
835 } 835 }
836 836
837 if (!originTrialContext->featureBindingsInstalled("WebBluetooth") && (Runtim eEnabledFeatures::webBluetoothEnabled() || originTrialContext->isFeatureEnabled( "WebBluetooth", nullptr))) { 837 if (!originTrialContext->featureBindingsInstalled("WebBluetooth") && (Runtim eEnabledFeatures::webBluetoothEnabled() || originTrialContext->isFeatureEnabled( "WebBluetooth"))) {
838 originTrialContext->setFeatureBindingsInstalled("WebBluetooth"); 838 originTrialContext->setFeatureBindingsInstalled("WebBluetooth");
839 } 839 }
840 } 840 }
841 841
842 InstallOriginTrialsFunction setInstallOriginTrialsFunction(InstallOriginTrialsFu nction newInstallOriginTrialsFunction) 842 InstallOriginTrialsFunction setInstallOriginTrialsFunction(InstallOriginTrialsFu nction newInstallOriginTrialsFunction)
843 { 843 {
844 InstallOriginTrialsFunction originalFunction = s_installOriginTrialsFunction ; 844 InstallOriginTrialsFunction originalFunction = s_installOriginTrialsFunction ;
845 s_installOriginTrialsFunction = newInstallOriginTrialsFunction; 845 s_installOriginTrialsFunction = newInstallOriginTrialsFunction;
846 return originalFunction; 846 return originalFunction;
847 } 847 }
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
948 v8SetReturnValue(info, perContextData->constructorForType(WrapperTypeInfo::u nwrap(data))); 948 v8SetReturnValue(info, perContextData->constructorForType(WrapperTypeInfo::u nwrap(data)));
949 } 949 }
950 950
951 v8::Local<v8::Value> freezeV8Object(v8::Local<v8::Value> value, v8::Isolate* iso late) 951 v8::Local<v8::Value> freezeV8Object(v8::Local<v8::Value> value, v8::Isolate* iso late)
952 { 952 {
953 v8CallOrCrash(value.As<v8::Object>()->SetIntegrityLevel(isolate->GetCurrentC ontext(), v8::IntegrityLevel::kFrozen)); 953 v8CallOrCrash(value.As<v8::Object>()->SetIntegrityLevel(isolate->GetCurrentC ontext(), v8::IntegrityLevel::kFrozen));
954 return value; 954 return value;
955 } 955 }
956 956
957 } // namespace blink 957 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698