Skip to content

Commit 3e75331

Browse files
cztomczakcztomczak
committed
Updated to Chrome 25.0.1364.152, CEF 1 branch 1364 revision 1123.
1 parent 6ab5f95 commit 3e75331

22 files changed

+3479
-720
lines changed

‎cefpython/cef1/include/cef_app.h‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2011 Marshall A. Greenblatt. All rights reserved.
1+
// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved.
22
//
33
// Redistribution and use in source and binary forms, with or without
44
// modification, are permitted provided that the following conditions are
@@ -42,6 +42,7 @@
4242
#include "include/cef_base.h"
4343
#include "include/cef_proxy_handler.h"
4444
#include "include/cef_resource_bundle_handler.h"
45+
#include "include/cef_scheme.h"
4546

4647
class CefApp;
4748

@@ -91,6 +92,12 @@ void CefRunMessageLoop();
9192
/*--cef()--*/
9293
void CefQuitMessageLoop();
9394

95+
///
96+
// Set to true before calling Windows APIs like TrackPopupMenu that enter a
97+
// modal message loop. Set to false after exiting the modal message loop.
98+
///
99+
/*--cef()--*/
100+
void CefSetOSModalLoop(bool osModalLoop);
94101

95102
///
96103
// Implement this interface to provide handler implementations. Methods will be
@@ -99,6 +106,15 @@ void CefQuitMessageLoop();
99106
/*--cef(source=client,no_debugct_check)--*/
100107
class CefApp : public virtual CefBase {
101108
public:
109+
///
110+
// Provides an opportunity to register custom schemes. Do not keep a reference
111+
// to the |registrar| object. This method is called on the UI thread.
112+
///
113+
/*--cef()--*/
114+
virtual void OnRegisterCustomSchemes(
115+
CefRefPtr<CefSchemeRegistrar> registrar) {
116+
}
117+
102118
///
103119
// Return the handler for resource bundle events. If
104120
// CefSettings.pack_loading_disabled is true a handler must be returned. If no

‎cefpython/cef1/include/cef_application_mac.h‎

Lines changed: 0 additions & 120 deletions
This file was deleted.

‎cefpython/cef1/include/cef_display_handler.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,13 @@ class CefDisplayHandler : public virtual CefBase {
8383
virtual void OnTitleChange(CefRefPtr<CefBrowser> browser,
8484
const CefString& title) {}
8585

86+
///
87+
// Called when the Favicon URL for a page changes.
88+
///
89+
/*--cef()--*/
90+
virtual void OnFaviconURLChange(CefRefPtr<CefBrowser> browser,
91+
const std::vector<CefString>& icon_urls) {}
92+
8693
///
8794
// Called when the browser is about to display a tooltip. |text| contains the
8895
// text that will be displayed in the tooltip. To handle the display of the

‎cefpython/cef1/include/cef_request_handler.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ class CefRequestHandler : public virtual CefBase {
132132
// CefDownloadHandler instance that will recieve the file contents. Return
133133
// true to download the file or false to cancel the file download.
134134
///
135-
/*--cef()--*/
135+
/*--cef(optional_param=mimeType)--*/
136136
virtual bool GetDownloadHandler(CefRefPtr<CefBrowser> browser,
137137
const CefString& mimeType,
138138
const CefString& fileName,

‎cefpython/cef1/include/cef_scheme.h‎

Lines changed: 61 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -46,57 +46,6 @@
4646
class CefSchemeHandler;
4747
class CefSchemeHandlerFactory;
4848

49-
///
50-
// Register a custom scheme. This method should not be called for the built-in
51-
// HTTP, HTTPS, FILE, FTP, ABOUT and DATA schemes.
52-
//
53-
// If |is_standard| is true the scheme will be treated as a standard scheme.
54-
// Standard schemes are subject to URL canonicalization and parsing rules as
55-
// defined in the Common Internet Scheme Syntax RFC 1738 Section 3.1 available
56-
// at http://www.ietf.org/rfc/rfc1738.txt
57-
//
58-
// In particular, the syntax for standard scheme URLs must be of the form:
59-
// <pre>
60-
// [scheme]://[username]:[password]@[host]:[port]/[url-path]
61-
// </pre>
62-
// Standard scheme URLs must have a host component that is a fully qualified
63-
// domain name as defined in Section 3.5 of RFC 1034 [13] and Section 2.1 of RFC
64-
// 1123. These URLs will be canonicalized to "scheme://host/path" in the
65-
// simplest case and "scheme://username:password@host:port/path" in the most
66-
// explicit case. For example, "scheme:host/path" and "scheme:///host/path" will
67-
// both be canonicalized to "scheme://host/path". The origin of a standard
68-
// scheme URL is the combination of scheme, host and port (i.e.,
69-
// "scheme://host:port" in the most explicit case).
70-
//
71-
// For non-standard scheme URLs only the "scheme:" component is parsed and
72-
// canonicalized. The remainder of the URL will be passed to the handler as-is.
73-
// For example, "scheme:///some%20text" will remain the same. Non-standard
74-
// scheme URLs cannot be used as a target for form submission.
75-
//
76-
// If |is_local| is true the scheme will be treated as local (i.e., with the
77-
// same security rules as those applied to "file" URLs). Normal pages cannot
78-
// link to or access local URLs. Also, by default, local URLs can only perform
79-
// XMLHttpRequest calls to the same URL (origin + path) that originated the
80-
// request. To allow XMLHttpRequest calls from a local URL to other URLs with
81-
// the same origin set the CefSettings.file_access_from_file_urls_allowed value
82-
// to true. To allow XMLHttpRequest calls from a local URL to all origins set
83-
// the CefSettings.universal_access_from_file_urls_allowed value to true.
84-
//
85-
// If |is_display_isolated| is true the scheme will be treated as display-
86-
// isolated. This means that pages cannot display these URLs unless they are
87-
// from the same scheme. For example, pages in another origin cannot create
88-
// iframes or hyperlinks to URLs with this scheme.
89-
//
90-
// This function may be called on any thread. It should only be called once
91-
// per unique |scheme_name| value. If |scheme_name| is already registered or if
92-
// an error occurs this method will return false.
93-
///
94-
/*--cef()--*/
95-
bool CefRegisterCustomScheme(const CefString& scheme_name,
96-
bool is_standard,
97-
bool is_local,
98-
bool is_display_isolated);
99-
10049
///
10150
// Register a scheme handler factory for the specified |scheme_name| and
10251
// optional |domain_name|. An empty |domain_name| value for a standard scheme
@@ -122,6 +71,66 @@ bool CefRegisterSchemeHandlerFactory(const CefString& scheme_name,
12271
bool CefClearSchemeHandlerFactories();
12372

12473

74+
///
75+
// Class that manages custom scheme registrations.
76+
///
77+
/*--cef(source=library)--*/
78+
class CefSchemeRegistrar : public virtual CefBase {
79+
public:
80+
///
81+
// Register a custom scheme. This method should not be called for the built-in
82+
// HTTP, HTTPS, FILE, FTP, ABOUT and DATA schemes.
83+
//
84+
// If |is_standard| is true the scheme will be treated as a standard scheme.
85+
// Standard schemes are subject to URL canonicalization and parsing rules as
86+
// defined in the Common Internet Scheme Syntax RFC 1738 Section 3.1 available
87+
// at http://www.ietf.org/rfc/rfc1738.txt
88+
//
89+
// In particular, the syntax for standard scheme URLs must be of the form:
90+
// <pre>
91+
// [scheme]://[username]:[password]@[host]:[port]/[url-path]
92+
// </pre>
93+
// Standard scheme URLs must have a host component that is a fully qualified
94+
// domain name as defined in Section 3.5 of RFC 1034 [13] and Section 2.1 of
95+
// RFC 1123. These URLs will be canonicalized to "scheme://host/path" in the
96+
// simplest case and "scheme://username:password@host:port/path" in the most
97+
// explicit case. For example, "scheme:host/path" and "scheme:///host/path"
98+
// will both be canonicalized to "scheme://host/path". The origin of a
99+
// standard scheme URL is the combination of scheme, host and port (i.e.,
100+
// "scheme://host:port" in the most explicit case).
101+
//
102+
// For non-standard scheme URLs only the "scheme:" component is parsed and
103+
// canonicalized. The remainder of the URL will be passed to the handler
104+
// as-is. For example, "scheme:///some%20text" will remain the same.
105+
// Non-standard scheme URLs cannot be used as a target for form submission.
106+
//
107+
// If |is_local| is true the scheme will be treated as local (i.e., with the
108+
// same security rules as those applied to "file" URLs). Normal pages cannot
109+
// link to or access local URLs. Also, by default, local URLs can only perform
110+
// XMLHttpRequest calls to the same URL (origin + path) that originated the
111+
// request. To allow XMLHttpRequest calls from a local URL to other URLs with
112+
// the same origin set the CefSettings.file_access_from_file_urls_allowed
113+
// value to true. To allow XMLHttpRequest calls from a local URL to all
114+
// origins set the CefSettings.universal_access_from_file_urls_allowed value
115+
// to true.
116+
//
117+
// If |is_display_isolated| is true the scheme will be treated as display-
118+
// isolated. This means that pages cannot display these URLs unless they are
119+
// from the same scheme. For example, pages in another origin cannot create
120+
// iframes or hyperlinks to URLs with this scheme.
121+
//
122+
// This function may be called on any thread. It should only be called once
123+
// per unique |scheme_name| value. If |scheme_name| is already registered or
124+
// if an error occurs this method will return false.
125+
///
126+
/*--cef()--*/
127+
virtual bool AddCustomScheme(const CefString& scheme_name,
128+
bool is_standard,
129+
bool is_local,
130+
bool is_display_isolated) =0;
131+
};
132+
133+
125134
///
126135
// Class that creates CefSchemeHandler instances. The methods of this class will
127136
// always be called on the IO thread.
@@ -135,7 +144,7 @@ class CefSchemeHandlerFactory : public virtual CefBase {
135144
// initiated using the CefWebURLRequest API |browser| will be NULL. The
136145
// |request| object passed to this method will not contain cookie data.
137146
///
138-
/*--cef()--*/
147+
/*--cef(optional_param=browser)--*/
139148
virtual CefRefPtr<CefSchemeHandler> Create(CefRefPtr<CefBrowser> browser,
140149
const CefString& scheme_name,
141150
CefRefPtr<CefRequest> request) =0;

‎cefpython/cef1/include/cef_version.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved.
1+
// Copyright (c) 2013 Marshall A. Greenblatt. All rights reserved.
22
//
33
// Redistribution and use in source and binary forms, with or without
44
// modification, are permitted provided that the following conditions are
@@ -35,13 +35,13 @@
3535
#ifndef CEF_INCLUDE_CEF_VERSION_H_
3636
#define CEF_INCLUDE_CEF_VERSION_H_
3737

38-
#define CEF_REVISION 942
39-
#define COPYRIGHT_YEAR 2012
38+
#define CEF_REVISION 1123
39+
#define COPYRIGHT_YEAR 2013
4040

41-
#define CHROME_VERSION_MAJOR 23
41+
#define CHROME_VERSION_MAJOR 25
4242
#define CHROME_VERSION_MINOR 0
43-
#define CHROME_VERSION_BUILD 1271
44-
#define CHROME_VERSION_PATCH 95
43+
#define CHROME_VERSION_BUILD 1364
44+
#define CHROME_VERSION_PATCH 152
4545

4646
#define DO_MAKE_STRING(p) #p
4747
#define MAKE_STRING(p) DO_MAKE_STRING(p)

0 commit comments

Comments
 (0)