mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
- Update to Chromium revision 133430.
- Move custom scheme registration to CefApp::OnRegisterCustomSchemes(). This is required by the introduction of ContentClient::AddAdditionalSchemes() and fixes a race condition when registering standard schemes in different processes. - Execute V8 functions using V8Proxy. This is required for inspector instrumentation to work correctly and fixes an assertion in WebCore related to V8RecursionScope. - Enable verbose V8 TryCatch logging. - Mac: Expose UnderlayOpenGLHostingWindow interface that should be used for all CEF windows. - Add CefSettings.remote_debugging_port option. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@602 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@ -325,20 +325,6 @@ TestResults g_TestResults;
|
||||
// If |domain| is empty the scheme will be registered as non-standard.
|
||||
void RegisterTestScheme(const std::string& scheme, const std::string& domain) {
|
||||
g_TestResults.reset();
|
||||
static std::set<std::string> schemes;
|
||||
|
||||
if (schemes.empty()) {
|
||||
// Never register built-in schemes.
|
||||
schemes.insert("http");
|
||||
}
|
||||
|
||||
// Only register custom schemes one time.
|
||||
if (schemes.find(scheme) == schemes.end()) {
|
||||
EXPECT_TRUE(CefRegisterCustomScheme(scheme, domain.empty()?false:true,
|
||||
false, false));
|
||||
WaitForUIThread();
|
||||
schemes.insert(scheme);
|
||||
}
|
||||
|
||||
EXPECT_TRUE(CefRegisterSchemeHandlerFactory(scheme, domain,
|
||||
new ClientSchemeHandlerFactory(&g_TestResults)));
|
||||
@ -961,3 +947,12 @@ TEST(SchemeHandlerTest, HttpXSSDifferentOriginWithDomain) {
|
||||
|
||||
ClearTestSchemes();
|
||||
}
|
||||
|
||||
// Called to register custom schemes.
|
||||
void RegisterSchemeHandlerCustomSchemes(
|
||||
CefRefPtr<CefSchemeRegistrar> registrar) {
|
||||
// Add a custom standard scheme.
|
||||
registrar->AddCustomScheme("customstd", true, false, false);
|
||||
// Ad a custom non-standard scheme.
|
||||
registrar->AddCustomScheme("customnonstd", false, false, false);
|
||||
}
|
||||
|
Reference in New Issue
Block a user