Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

update to CEF r1123, Chromium 25.0.1364.152

  • Loading branch information...
commit 657e1c9b8032c045515ec7c0959c7afd3fcdce7e 1 parent ea2903b
@ataranto ataranto authored
View
1  CefSharp/CefSharp.h
@@ -105,7 +105,6 @@ namespace CefSharp
hostName = hostName ? hostName : String::Empty;
CefRefPtr<CefSchemeHandlerFactory> wrapper = new SchemeHandlerFactoryWrapper(factory);
- CefRegisterCustomScheme(toNative(schemeName), is_standard, false, false);
return CefRegisterSchemeHandlerFactory(toNative(schemeName), toNative(hostName), wrapper);
}
View
BIN  Release/devtools_resources.pak
Binary file not shown
View
BIN  Release/libcef.dll
Binary file not shown
View
12 include/cef_app.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
@@ -42,6 +42,7 @@
#include "include/cef_base.h"
#include "include/cef_proxy_handler.h"
#include "include/cef_resource_bundle_handler.h"
+#include "include/cef_scheme.h"
class CefApp;
@@ -106,6 +107,15 @@ void CefSetOSModalLoop(bool osModalLoop);
class CefApp : public virtual CefBase {
public:
///
+ // Provides an opportunity to register custom schemes. Do not keep a reference
+ // to the |registrar| object. This method is called on the UI thread.
+ ///
+ /*--cef()--*/
+ virtual void OnRegisterCustomSchemes(
+ CefRefPtr<CefSchemeRegistrar> registrar) {
+ }
+
+ ///
// Return the handler for resource bundle events. If
// CefSettings.pack_loading_disabled is true a handler must be returned. If no
// handler is returned resources will be loaded from pack files. This method
View
111 include/cef_scheme.h
@@ -47,57 +47,6 @@ class CefSchemeHandler;
class CefSchemeHandlerFactory;
///
-// Register a custom scheme. This method should not be called for the built-in
-// HTTP, HTTPS, FILE, FTP, ABOUT and DATA schemes.
-//
-// If |is_standard| is true the scheme will be treated as a standard scheme.
-// Standard schemes are subject to URL canonicalization and parsing rules as
-// defined in the Common Internet Scheme Syntax RFC 1738 Section 3.1 available
-// at http://www.ietf.org/rfc/rfc1738.txt
-//
-// In particular, the syntax for standard scheme URLs must be of the form:
-// <pre>
-// [scheme]://[username]:[password]@[host]:[port]/[url-path]
-// </pre>
-// Standard scheme URLs must have a host component that is a fully qualified
-// domain name as defined in Section 3.5 of RFC 1034 [13] and Section 2.1 of RFC
-// 1123. These URLs will be canonicalized to "scheme://host/path" in the
-// simplest case and "scheme://username:password@host:port/path" in the most
-// explicit case. For example, "scheme:host/path" and "scheme:///host/path" will
-// both be canonicalized to "scheme://host/path". The origin of a standard
-// scheme URL is the combination of scheme, host and port (i.e.,
-// "scheme://host:port" in the most explicit case).
-//
-// For non-standard scheme URLs only the "scheme:" component is parsed and
-// canonicalized. The remainder of the URL will be passed to the handler as-is.
-// For example, "scheme:///some%20text" will remain the same. Non-standard
-// scheme URLs cannot be used as a target for form submission.
-//
-// If |is_local| is true the scheme will be treated as local (i.e., with the
-// same security rules as those applied to "file" URLs). Normal pages cannot
-// link to or access local URLs. Also, by default, local URLs can only perform
-// XMLHttpRequest calls to the same URL (origin + path) that originated the
-// request. To allow XMLHttpRequest calls from a local URL to other URLs with
-// the same origin set the CefSettings.file_access_from_file_urls_allowed value
-// to true. To allow XMLHttpRequest calls from a local URL to all origins set
-// the CefSettings.universal_access_from_file_urls_allowed value to true.
-//
-// If |is_display_isolated| is true the scheme will be treated as display-
-// isolated. This means that pages cannot display these URLs unless they are
-// from the same scheme. For example, pages in another origin cannot create
-// iframes or hyperlinks to URLs with this scheme.
-//
-// This function may be called on any thread. It should only be called once
-// per unique |scheme_name| value. If |scheme_name| is already registered or if
-// an error occurs this method will return false.
-///
-/*--cef()--*/
-bool CefRegisterCustomScheme(const CefString& scheme_name,
- bool is_standard,
- bool is_local,
- bool is_display_isolated);
-
-///
// Register a scheme handler factory for the specified |scheme_name| and
// optional |domain_name|. An empty |domain_name| value for a standard scheme
// will cause the factory to match all domain names. The |domain_name| value
@@ -123,6 +72,66 @@ bool CefClearSchemeHandlerFactories();
///
+// Class that manages custom scheme registrations.
+///
+/*--cef(source=library)--*/
+class CefSchemeRegistrar : public virtual CefBase {
+ public:
+ ///
+ // Register a custom scheme. This method should not be called for the built-in
+ // HTTP, HTTPS, FILE, FTP, ABOUT and DATA schemes.
+ //
+ // If |is_standard| is true the scheme will be treated as a standard scheme.
+ // Standard schemes are subject to URL canonicalization and parsing rules as
+ // defined in the Common Internet Scheme Syntax RFC 1738 Section 3.1 available
+ // at http://www.ietf.org/rfc/rfc1738.txt
+ //
+ // In particular, the syntax for standard scheme URLs must be of the form:
+ // <pre>
+ // [scheme]://[username]:[password]@[host]:[port]/[url-path]
+ // </pre>
+ // Standard scheme URLs must have a host component that is a fully qualified
+ // domain name as defined in Section 3.5 of RFC 1034 [13] and Section 2.1 of
+ // RFC 1123. These URLs will be canonicalized to "scheme://host/path" in the
+ // simplest case and "scheme://username:password@host:port/path" in the most
+ // explicit case. For example, "scheme:host/path" and "scheme:///host/path"
+ // will both be canonicalized to "scheme://host/path". The origin of a
+ // standard scheme URL is the combination of scheme, host and port (i.e.,
+ // "scheme://host:port" in the most explicit case).
+ //
+ // For non-standard scheme URLs only the "scheme:" component is parsed and
+ // canonicalized. The remainder of the URL will be passed to the handler
+ // as-is. For example, "scheme:///some%20text" will remain the same.
+ // Non-standard scheme URLs cannot be used as a target for form submission.
+ //
+ // If |is_local| is true the scheme will be treated as local (i.e., with the
+ // same security rules as those applied to "file" URLs). Normal pages cannot
+ // link to or access local URLs. Also, by default, local URLs can only perform
+ // XMLHttpRequest calls to the same URL (origin + path) that originated the
+ // request. To allow XMLHttpRequest calls from a local URL to other URLs with
+ // the same origin set the CefSettings.file_access_from_file_urls_allowed
+ // value to true. To allow XMLHttpRequest calls from a local URL to all
+ // origins set the CefSettings.universal_access_from_file_urls_allowed value
+ // to true.
+ //
+ // If |is_display_isolated| is true the scheme will be treated as display-
+ // isolated. This means that pages cannot display these URLs unless they are
+ // from the same scheme. For example, pages in another origin cannot create
+ // iframes or hyperlinks to URLs with this scheme.
+ //
+ // This function may be called on any thread. It should only be called once
+ // per unique |scheme_name| value. If |scheme_name| is already registered or
+ // if an error occurs this method will return false.
+ ///
+ /*--cef()--*/
+ virtual bool AddCustomScheme(const CefString& scheme_name,
+ bool is_standard,
+ bool is_local,
+ bool is_display_isolated) =0;
+};
+
+
+///
// Class that creates CefSchemeHandler instances. The methods of this class will
// always be called on the IO thread.
///
View
4 include/cef_version.h
@@ -35,13 +35,13 @@
#ifndef CEF_INCLUDE_CEF_VERSION_H_
#define CEF_INCLUDE_CEF_VERSION_H_
-#define CEF_REVISION 1112
+#define CEF_REVISION 1123
#define COPYRIGHT_YEAR 2013
#define CHROME_VERSION_MAJOR 25
#define CHROME_VERSION_MINOR 0
#define CHROME_VERSION_BUILD 1364
-#define CHROME_VERSION_PATCH 68
+#define CHROME_VERSION_PATCH 152
#define DO_MAKE_STRING(p) #p
#define MAKE_STRING(p) DO_MAKE_STRING(p)
View
BIN  libs/Debug/libcef.lib
Binary file not shown
View
BIN  libs/Debug/libcef_dll_wrapper.lib
Binary file not shown
View
BIN  libs/Release/libcef.lib
Binary file not shown
View
BIN  libs/Release/libcef_dll_wrapper.lib
Binary file not shown
Please sign in to comment.
Something went wrong with that request. Please try again.