Skip to content

Commit 91ec299

Browse files
cztomczakcztomczak
committed
Update to Chromium 57.0.2987.133 on Linux (incomplete) (cztomczak#341).
CEF 3.2987.1601.gf035232 Update patches.
1 parent 321b34a commit 91ec299

File tree

84 files changed

+836
-223
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+836
-223
lines changed

‎patches/issue125.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git http_cache_transaction.cc http_cache_transaction.cc
2-
index 717522eb6951..e92ba22a9ca9 100644
2+
index 24002d75215d..2a44a6368558 100644
33
--- http_cache_transaction.cc
44
+++ http_cache_transaction.cc
5-
@@ -2554,7 +2554,8 @@ int HttpCache::Transaction::WriteResponseInfoToEntry(bool truncated) {
5+
@@ -2601,7 +2601,8 @@ int HttpCache::Transaction::WriteResponseInfoToEntry(bool truncated) {
66
// blocking page is shown. An alternative would be to reverse-map the cert
77
// status to a net error and replay the net error.
88
if ((response_.headers->HasHeaderValue("cache-control", "no-store")) ||

‎patches/issue231.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ index 6a759309..ad620d7f 100644
8383
+ return PathService::Override(pref_key, file_path);
8484
+}
8585
diff --git libcef_dll/libcef_dll.cc libcef_dll/libcef_dll.cc
86-
index 1f037f92..b0274ad8 100644
86+
index 096eede2..05ecf9bd 100644
8787
--- libcef_dll/libcef_dll.cc
8888
+++ libcef_dll/libcef_dll.cc
89-
@@ -927,6 +927,23 @@ CEF_EXPORT int cef_get_path(cef_path_key_t key, cef_string_t* path) {
89+
@@ -959,6 +959,23 @@ CEF_EXPORT int cef_get_path(cef_path_key_t key, cef_string_t* path) {
9090
return _retval;
9191
}
9292

@@ -111,10 +111,10 @@ index 1f037f92..b0274ad8 100644
111111
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
112112

113113
diff --git libcef_dll/wrapper/libcef_dll_wrapper.cc libcef_dll/wrapper/libcef_dll_wrapper.cc
114-
index c4a1b559..a0b7765b 100644
114+
index 15026ab5..a3d21052 100644
115115
--- libcef_dll/wrapper/libcef_dll_wrapper.cc
116116
+++ libcef_dll/wrapper/libcef_dll_wrapper.cc
117-
@@ -848,6 +848,23 @@ CEF_GLOBAL bool CefGetPath(PathKey key, CefString& path) {
117+
@@ -880,6 +880,23 @@ CEF_GLOBAL bool CefGetPath(PathKey key, CefString& path) {
118118
return _retval?true:false;
119119
}
120120

‎patches/issue251.patch‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git include/capi/cef_drag_data_capi.h include/capi/cef_drag_data_capi.h
2-
index 2e84df8f..5b17e212 100644
2+
index e1fcfd8c..fc388247 100644
33
--- include/capi/cef_drag_data_capi.h
44
+++ include/capi/cef_drag_data_capi.h
55
@@ -39,6 +39,7 @@
@@ -34,7 +34,7 @@ index 2e84df8f..5b17e212 100644
3434

3535

3636
diff --git include/cef_drag_data.h include/cef_drag_data.h
37-
index 8f8094b4..8b4602b1 100644
37+
index 29b85e84..e3c9c2df 100644
3838
--- include/cef_drag_data.h
3939
+++ include/cef_drag_data.h
4040
@@ -39,6 +39,7 @@
@@ -45,7 +45,7 @@ index 8f8094b4..8b4602b1 100644
4545
#include "include/cef_stream.h"
4646
#include <vector>
4747

48-
@@ -193,6 +194,24 @@ class CefDragData : public virtual CefBase {
48+
@@ -193,6 +194,24 @@ class CefDragData : public virtual CefBaseRefCounted {
4949
///
5050
/*--cef(optional_param=display_name)--*/
5151
virtual void AddFile(const CefString& path, const CefString& display_name) =0;
@@ -181,7 +181,7 @@ index 64f29ed3..98707262 100644
181181
// True if this object is read-only.
182182
bool read_only_;
183183
diff --git libcef_dll/cpptoc/drag_data_cpptoc.cc libcef_dll/cpptoc/drag_data_cpptoc.cc
184-
index ffad1755..70a6c5c2 100644
184+
index 381b88b9..6f4925a0 100644
185185
--- libcef_dll/cpptoc/drag_data_cpptoc.cc
186186
+++ libcef_dll/cpptoc/drag_data_cpptoc.cc
187187
@@ -11,6 +11,7 @@
@@ -254,9 +254,9 @@ index ffad1755..70a6c5c2 100644
254254
+ GetStruct()->has_image = drag_data_has_image;
255255
}
256256

257-
template<> CefRefPtr<CefDragData> CefCppToC<CefDragDataCppToC, CefDragData,
257+
template<> CefRefPtr<CefDragData> CefCppToCRefCounted<CefDragDataCppToC,
258258
diff --git libcef_dll/ctocpp/drag_data_ctocpp.cc libcef_dll/ctocpp/drag_data_ctocpp.cc
259-
index ab27df2e..0b37224a 100644
259+
index db1a2f71..5e94aff8 100644
260260
--- libcef_dll/ctocpp/drag_data_ctocpp.cc
261261
+++ libcef_dll/ctocpp/drag_data_ctocpp.cc
262262
@@ -11,6 +11,7 @@
@@ -320,10 +320,10 @@ index ab27df2e..0b37224a 100644
320320
// CONSTRUCTOR - Do not edit by hand.
321321

322322
diff --git libcef_dll/ctocpp/drag_data_ctocpp.h libcef_dll/ctocpp/drag_data_ctocpp.h
323-
index 85ea3e58..24283697 100644
323+
index 5b202710..a2e3774f 100644
324324
--- libcef_dll/ctocpp/drag_data_ctocpp.h
325325
+++ libcef_dll/ctocpp/drag_data_ctocpp.h
326-
@@ -53,6 +53,9 @@ class CefDragDataCToCpp
326+
@@ -54,6 +54,9 @@ class CefDragDataCToCpp
327327
void SetFragmentBaseURL(const CefString& base_url) OVERRIDE;
328328
void ResetFileContents() OVERRIDE;
329329
void AddFile(const CefString& path, const CefString& display_name) OVERRIDE;

‎src/extern/cef/cef_base.pxd‎

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

‎src/include/base/cef_build.h‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,4 +189,13 @@
189189
#endif
190190
#endif // OVERRIDE
191191

192+
// Check for C++11 template alias support which was added in VS2013 and GCC4.7.
193+
// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2258.pdf
194+
#if __cplusplus > 199711L || \
195+
(defined(_MSC_VER) && _MSC_VER >= 1800) || \
196+
(defined(__GNUC__) && \
197+
(__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ >= 40700))
198+
#define HAS_CPP11_TEMPLATE_ALIAS_SUPPORT
199+
#endif
200+
192201
#endif // CEF_INCLUDE_BASE_CEF_BUILD_H_

‎src/include/cef_app.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ void CefEnableHighDPISupport();
143143
// called by the process and/or thread indicated.
144144
///
145145
/*--cef(source=client,no_debugct_check)--*/
146-
class CefApp : public virtual CefBase {
146+
class CefApp : public virtual CefBaseRefCounted {
147147
public:
148148
///
149149
// Provides an opportunity to view and/or modify command-line arguments before
@@ -170,7 +170,7 @@ class CefApp : public virtual CefBase {
170170
///
171171
/*--cef()--*/
172172
virtual void OnRegisterCustomSchemes(
173-
CefRefPtr<CefSchemeRegistrar> registrar) {
173+
CefRawPtr<CefSchemeRegistrar> registrar) {
174174
}
175175

176176
///

‎src/include/cef_auth_callback.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
// requests.
4646
///
4747
/*--cef(source=library)--*/
48-
class CefAuthCallback : public virtual CefBase {
48+
class CefAuthCallback : public virtual CefBaseRefCounted {
4949
public:
5050
///
5151
// Continue the authentication request.

‎src/include/cef_base.h‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,9 @@
4848
#endif
4949

5050
///
51-
// Interface defining the reference count implementation methods. All framework
52-
// classes must extend the CefBase class.
51+
// All ref-counted framework classes must extend this class.
5352
///
54-
class CefBase {
53+
class CefBaseRefCounted {
5554
public:
5655
///
5756
// Called to increment the reference count for the object. Should be called
@@ -71,7 +70,15 @@ class CefBase {
7170
virtual bool HasOneRef() const =0;
7271

7372
protected:
74-
virtual ~CefBase() {}
73+
virtual ~CefBaseRefCounted() {}
74+
};
75+
76+
///
77+
// All scoped framework classes must extend this class.
78+
///
79+
class CefBaseScoped {
80+
public:
81+
virtual ~CefBaseScoped() {}
7582
};
7683

7784
///
@@ -141,7 +148,7 @@ class CefRefCount {
141148
// #include "include/base/cef_lock.h"
142149
//
143150
// // Class declaration.
144-
// class MyClass : public CefBase {
151+
// class MyClass : public CefBaseRefCounted {
145152
// public:
146153
// MyClass() : value_(0) {}
147154
// // Method that may be called on multiple threads.

‎src/include/cef_browser.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class CefClient;
5858
// this class may only be called on the main thread.
5959
///
6060
/*--cef(source=library)--*/
61-
class CefBrowser : public virtual CefBase {
61+
class CefBrowser : public virtual CefBaseRefCounted {
6262
public:
6363
///
6464
// Returns the browser host object. This method can only be called in the
@@ -197,7 +197,7 @@ class CefBrowser : public virtual CefBase {
197197
// class will be called on the browser process UI thread.
198198
///
199199
/*--cef(source=client)--*/
200-
class CefRunFileDialogCallback : public virtual CefBase {
200+
class CefRunFileDialogCallback : public virtual CefBaseRefCounted {
201201
public:
202202
///
203203
// Called asynchronously after the file dialog is dismissed.
@@ -218,7 +218,7 @@ class CefRunFileDialogCallback : public virtual CefBase {
218218
// this class will be called on the browser process UI thread.
219219
///
220220
/*--cef(source=client)--*/
221-
class CefNavigationEntryVisitor : public virtual CefBase {
221+
class CefNavigationEntryVisitor : public virtual CefBaseRefCounted {
222222
public:
223223
///
224224
// Method that will be executed. Do not keep a reference to |entry| outside of
@@ -240,7 +240,7 @@ class CefNavigationEntryVisitor : public virtual CefBase {
240240
// will be called on the browser process UI thread.
241241
///
242242
/*--cef(source=client)--*/
243-
class CefPdfPrintCallback : public virtual CefBase {
243+
class CefPdfPrintCallback : public virtual CefBaseRefCounted {
244244
public:
245245
///
246246
// Method that will be executed when the PDF printing has completed. |path|
@@ -257,7 +257,7 @@ class CefPdfPrintCallback : public virtual CefBase {
257257
// class will be called on the browser process UI thread.
258258
///
259259
/*--cef(source=client)--*/
260-
class CefDownloadImageCallback : public virtual CefBase {
260+
class CefDownloadImageCallback : public virtual CefBaseRefCounted {
261261
public:
262262
///
263263
// Method that will be executed when the image download has completed.
@@ -280,7 +280,7 @@ class CefDownloadImageCallback : public virtual CefBase {
280280
// comments.
281281
///
282282
/*--cef(source=library)--*/
283-
class CefBrowserHost : public virtual CefBase {
283+
class CefBrowserHost : public virtual CefBaseRefCounted {
284284
public:
285285
typedef cef_drag_operations_mask_t DragOperationsMask;
286286
typedef cef_file_dialog_mode_t FileDialogMode;

‎src/include/cef_browser_process_handler.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
// will be called on the browser process main thread unless otherwise indicated.
4949
///
5050
/*--cef(source=client)--*/
51-
class CefBrowserProcessHandler : public virtual CefBase {
51+
class CefBrowserProcessHandler : public virtual CefBaseRefCounted {
5252
public:
5353
///
5454
// Called on the browser process UI thread immediately after the CEF context

0 commit comments

Comments
 (0)