mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium revision 40af916d (#303546).
- Standardize usage of virtual/override specifiers in CEF internals (see http://crbug.com/417463). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1903 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@ -1,5 +1,5 @@
|
||||
diff --git common.gypi common.gypi
|
||||
index dc0f525..fb1889c 100644
|
||||
index f97bf66..116c7bc 100644
|
||||
--- common.gypi
|
||||
+++ common.gypi
|
||||
@@ -9,6 +9,9 @@
|
||||
@ -12,7 +12,7 @@ index dc0f525..fb1889c 100644
|
||||
# Putting a variables dict inside another variables dict looks kind of
|
||||
# weird. This is done so that 'host_arch', 'chromeos', etc are defined as
|
||||
# variables within the outer variables dict here. This is necessary
|
||||
@@ -5391,6 +5394,9 @@
|
||||
@@ -5486,6 +5489,9 @@
|
||||
4510, # Default constructor could not be generated
|
||||
4512, # Assignment operator could not be generated
|
||||
4610, # Object can never be instantiated
|
||||
@ -23,10 +23,10 @@ index dc0f525..fb1889c 100644
|
||||
'msvs_settings': {
|
||||
'VCCLCompilerTool': {
|
||||
diff --git gyp_chromium gyp_chromium
|
||||
index 326919c0..67d0a00 100755
|
||||
index ad2796b..1407d9c 100755
|
||||
--- gyp_chromium
|
||||
+++ gyp_chromium
|
||||
@@ -263,12 +263,6 @@ if __name__ == '__main__':
|
||||
@@ -269,12 +269,6 @@ if __name__ == '__main__':
|
||||
if sys.platform not in ('darwin',):
|
||||
args.append('--no-circular-check')
|
||||
|
||||
|
Reference in New Issue
Block a user