Electron
/
libchromiumcontent
зеркало из https://github.com/electron/libchromiumcontent.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge pull request #25 from brightray/29.0.1547.57 

Update to Chrome 29
This commit is contained in:
Adam Roben 2013-08-23 13:55:18 -07:00
Родитель 65a2dcfc44 43b5cc55e4
Коммит ccec3a4031
13 изменённых файлов: 1877 добавлений и 91 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
VERSION
Просмотреть файл

@ -1 +1 @@
28.0.1500.71
29.0.1547.57

33
chromiumcontent.gyp
Просмотреть файл

@ -52,9 +52,6 @@
},
}],
['OS=="mac"', {
'dependencies': [
'chrome_browser_ui',
],
'xcode_settings': {
'OTHER_LDFLAGS': [
'-all_load',
@ -166,35 +163,5 @@
},
],
}],
['OS=="mac"', {
'targets': [
{
'target_name': 'chrome_browser_ui',
'type': 'static_library',
'sources': [
'<(DEPTH)/chrome/browser/ui/cocoa/event_utils.h',
'<(DEPTH)/chrome/browser/ui/cocoa/event_utils.mm',
'<(DEPTH)/chrome/browser/ui/cocoa/menu_controller.h',
'<(DEPTH)/chrome/browser/ui/cocoa/menu_controller.mm',
],
'dependencies': [
# Import Skia's include_dirs for finding the SkUserConfig.h,
'<(DEPTH)/skia/skia.gyp:skia',
# and ICU for unicode/*.h.
'<(DEPTH)/third_party/icu/icu.gyp:icui18n',
'<(DEPTH)/third_party/icu/icu.gyp:icuuc',
],
'include_dirs': [
'<(DEPTH)'
],
'xcode_settings': {
# Export all symbols from this static library even though they aren't
# specified to be exported in the source code.
'GCC_INLINES_ARE_PRIVATE_EXTERN': 'NO',
'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
},
},
],
}],
],
}

30
chromiumcontent.gypi
Просмотреть файл

@ -17,6 +17,7 @@
'BASE_I18N_IMPLEMENTATION',
'BASE_IMPLEMENTATION',
'BASE_PREFS_IMPLEMENTATION',
'BLINK_COMMON_IMPLEMENTATION',
'BUILDING_V8_SHARED',
'CC_IMPLEMENTATION',
'COMPILER_IMPLEMENTATION',
@ -28,8 +29,6 @@
'GLES2_IMPL_IMPLEMENTATION',
'GLES2_UTILS_IMPLEMENTATION',
'GPU_IMPLEMENTATION',
'GURL_DLL',
'GURL_IMPLEMENTATION',
'IPC_IMPLEMENTATION',
'LIBPROTOBUF_EXPORTS',
'LIBPROTOC_EXPORTS',
@ -51,13 +50,21 @@
'U_NO_GLOBAL_NEW_DELETE',
'U_UTF8_IMPL',
'UI_IMPLEMENTATION',
'URL_IMPLEMENTATION',
'V8_SHARED',
'WEBKIT_BASE_IMPLEMENTATION',
'WEBKIT_CHILD_IMPLEMENTATION',
'WEBKIT_COMMON_IMPLEMENTATION',
'WEBKIT_COMPOSITOR_BINDINGS_IMPLEMENTATION',
'WEBKIT_EXTENSIONS_IMPLEMENTATION',
'WEBKIT_GLUE_IMPLEMENTATION',
'WEBKIT_GPU_IMPLEMENTATION',
'WEBKIT_IMPLEMENTATION',
'WEBKIT_PLUGINS_IMPLEMENTATION',
'WEBKIT_STORAGE_IMPLEMENTATION',
'WEBKIT_RENDERER_IMPLEMENTATION',
'WEBKIT_STORAGE_BROWSER_IMPLEMENTATION',
'WEBKIT_STORAGE_COMMON_IMPLEMENTATION',
'WEBKIT_STORAGE_RENDERER_IMPLEMENTATION',
'WEBKIT_USER_AGENT_IMPLEMENTATION',
'WEBORIGIN_IMPLEMENTATION',
'WTF_IMPLEMENTATION',
@ -77,22 +84,6 @@
},
},
'target_conditions': [
# If WebKit were like all other modules, we'd define both WEBKIT_DLL and
# WEBKIT_IMPLEMENTATION everywhere so that all symbols would be marked
# __declspec(dllexport) or __attribute__((visibility("default"))) and
# thus exported from our shared library. But when WEBKIT_IMPLEMENTATION is
# defined, WebKit headers include WebCore headers and types, and those
# headers and types aren't available outside of WebKit, leading to build
# errors. So instead we define WEBKIT_DLL only when WEBKIT_IMPLEMENTATION
# is defined. This means that within WebKit symbols will be marked as
# exported, and outside of WebKit they won't be annotated at all. This
# works just fine; the linker sees the public definitions and exports the
# symbols even though the symbols aren't decorated the same way everywhere.
['_target_name in ["webcore_prerequisites", "webkit_platform", "webkit", "webkit_wtf_support"]', {
'defines': [
'WEBKIT_DLL',
],
}],
['_target_name=="base"', {
# This file doesn't work inside a shared library, and won't compile at
# all when COMPONENT_BUILD is defined.
@ -127,6 +118,7 @@
'IPC_IMPLEMENTATION',
'SKIA_IMPLEMENTATION',
'UI_IMPLEMENTATION',
'URL_IMPLEMENTATION',
],
}],
['_target_name in ["v8", "v8_snapshot", "v8_shell", "preparser_lib"] or "v8_nosnapshot." in _target_name or "v8_base." in _target_name or "mksnapshot." in _target_name', {

13
patches/content_decryptor_delegate.patch
Просмотреть файл

@ -9,18 +9,19 @@ Index: webkit/plugins/ppapi/content_decryptor_delegate.cc
+ContentDecryptorDelegate::~ContentDecryptorDelegate() {
+}
+
void ContentDecryptorDelegate::SetKeyEventCallbacks(
const media::KeyAddedCB& key_added_cb,
const media::KeyErrorCB& key_error_cb,
void ContentDecryptorDelegate::Initialize(const std::string& key_system) {
// TODO(ddorwin): Add an Initialize method to PPP_ContentDecryptor_Private.
DCHECK(!key_system.empty());
key_system_ = key_system;
Index: webkit/plugins/ppapi/content_decryptor_delegate.h
===================================================================
--- webkit/plugins/ppapi/content_decryptor_delegate.h (revision 194718)
+++ webkit/plugins/ppapi/content_decryptor_delegate.h (working copy)
@@ -37,6 +37,7 @@
@@ -38,6 +38,7 @@
ContentDecryptorDelegate(
PP_Instance pp_instance,
const PPP_ContentDecryptor_Private* plugin_decryption_interface);
+ ~ContentDecryptorDelegate();
void SetKeyEventCallbacks(const media::KeyAddedCB& key_added_cb,
const media::KeyErrorCB& key_error_cb,
void Initialize(const std::string& key_system);

8
patches/dom_storage_host.patch
Просмотреть файл

@ -1,8 +1,8 @@
Index: webkit/dom_storage/dom_storage_host.h
Index: webkit/browser/dom_storage/dom_storage_host.h
===================================================================
--- webkit/dom_storage/dom_storage_host.h (revision 194718)
+++ webkit/dom_storage/dom_storage_host.h (working copy)
@@ -64,6 +64,8 @@
--- webkit/browser/dom_storage/dom_storage_host.h (revision 194718)
+++ webkit/browser/dom_storage/dom_storage_host.h (working copy)
@@ -65,6 +65,8 @@
scoped_refptr<DomStorageContext> context_;
AreaMap connections_;

1792
patches/inside_webkit.patch Normal file
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

2
patches/resource_update.patch
Просмотреть файл

@ -12,7 +12,7 @@ Index: cc/resources/resource_update.h
#include "ui/gfx/vector2d.h"
class SkBitmap;
class SkPicture;
-class SkCanvas;
namespace cc {

26
patches/v8_debug.patch Normal file
Просмотреть файл

@ -0,0 +1,26 @@
Index: v8/include/v8.h
===================================================================
--- v8/include/v8.h (revision 14861)
+++ v8/include/v8.h (working copy)
@@ -4168,7 +4168,7 @@
* be performed.
*/
class V8EXPORT AssertNoGCScope {
-#ifndef DEBUG
+#ifdef NDEBUG
// TODO(yangguo): remove isolate argument.
V8_INLINE(AssertNoGCScope(Isolate* isolate)) { }
#else
Index: v8/src/api.cc
===================================================================
--- v8/src/api.cc (revision 14861)
+++ v8/src/api.cc (working copy)
@@ -6411,7 +6411,7 @@
}
-#ifdef DEBUG
+#ifndef NDEBUG
v8::AssertNoGCScope::AssertNoGCScope(v8::Isolate* isolate) {
disallow_heap_allocation_ = new i::DisallowHeapAllocation();
}

8
script/apply-patches
Просмотреть файл

@ -86,7 +86,13 @@ def modified_paths():
if '>M' not in line:
continue
# The modified path is the last space-separated token on the line.
yield line.strip().split()[-1].replace(os.path.sep, '/')
path = line.strip().split()[-1].replace(os.path.sep, '/')
# Hack our way around http://crbug.com/278135.
if path == 'src/common/version.h' or path.startswith('src/libGLESv2/'):
continue
yield path
def paths_affected_by_patches():

10
script/cibuild
Просмотреть файл

@ -16,10 +16,10 @@ def main():
return 'Error: Can\'t find {0}'.format(S3_CREDENTIALS_FILE)
copy_to_environment(S3_CREDENTIALS_FILE)
run_script('bootstrap')
run_script('build')
run_script('create-dist')
run_script('upload')
return (run_script('bootstrap') or
run_script('build') or
run_script('create-dist') or
run_script('upload'))
def copy_to_environment(credentials_file):
@ -35,7 +35,7 @@ def run_script(script):
script = os.path.join('script', script)
sys.stderr.write('+ {0}\n'.format(script))
sys.stderr.flush()
subprocess.check_call([sys.executable, script])
return subprocess.call([sys.executable, script])
if __name__ == '__main__':

3
script/create-dist
Просмотреть файл

@ -106,12 +106,11 @@ INCLUDE_DIRS = [
'third_party/skia/include',
'third_party/wtl/include',
'ui',
'url',
'v8/include',
'webkit',
]
OTHER_HEADERS = [
'chrome/browser/ui/cocoa/event_utils.h',
'chrome/browser/ui/cocoa/menu_controller.h',
'content/common/content_export.h',
]
OTHER_SOURCES = [

38
script/update
Просмотреть файл

@ -15,14 +15,14 @@ CHROMIUMCONTENT_DIR = os.path.join(SRC_DIR, 'chromiumcontent')
def main():
write_dot_gclient()
gclient_sync()
install_win_toolchain()
import_win_environment()
apply_patches()
copy_gyp_files()
run_gyp()
install_win_tool_wrapper()
return (write_dot_gclient() or
gclient_sync() or
install_win_toolchain() or
import_win_environment() or
apply_patches() or
copy_gyp_files() or
run_gyp() or
install_win_tool_wrapper())
def write_dot_gclient():
@ -48,8 +48,8 @@ def gclient_sync():
return
sys.stderr.write('gclient sync failed. Reverting changes and trying again.\n')
sys.stderr.flush()
subprocess.check_call([sys.executable, gclient, 'revert'])
subprocess.check_call([sys.executable, gclient, 'sync'])
return (subprocess.call([sys.executable, gclient, 'revert']) or
subprocess.call([sys.executable, gclient, 'sync']))
def ensure_nacl_disabled():
@ -68,10 +68,10 @@ def install_win_toolchain():
if os.path.isdir(target_dir):
return
subprocess.check_call([chromium_python_path(),
os.path.join(os.path.relpath(SRC_DIR), 'tools',
'win', 'toolchain', 'toolchain.py'),
'--targetdir', os.path.relpath(target_dir)])
return subprocess.call([chromium_python_path(),
os.path.join(os.path.relpath(SRC_DIR), 'tools',
'win', 'toolchain', 'toolchain.py'),
'--targetdir', os.path.relpath(target_dir)])
def import_win_environment():
@ -107,7 +107,7 @@ def apply_patches():
# sure we have our gyp environment set.
ensure_nacl_disabled()
subprocess.check_call([sys.executable, os.path.join(SOURCE_ROOT, 'script', 'apply-patches')])
return subprocess.call([sys.executable, os.path.join(SOURCE_ROOT, 'script', 'apply-patches')])
def run_gyp():
@ -126,10 +126,10 @@ def run_gyp():
# not understand POSIX-style paths, to make it work we pass must relative
# paths to it.
gyp = os.path.join(REL_SRC_DIR, 'build', 'gyp_chromium')
subprocess.check_call([python, gyp, '-Ichromiumcontent.gypi',
'--depth', REL_SRC_DIR,
os.path.join(REL_CHROMIUMCONTENT_DIR,
'chromiumcontent.gyp')])
return subprocess.call([python, gyp, '-Ichromiumcontent.gypi',
'--depth', REL_SRC_DIR,
os.path.join(REL_CHROMIUMCONTENT_DIR,
'chromiumcontent.gyp')])
def install_win_tool_wrapper():

3
vendor/chromium/.gclient.in поставляемый
Просмотреть файл

@ -19,5 +19,8 @@ solutions = [
"src/chrome/tools/test/reference_build/chrome_mac": None,
"src/third_party/hunspell_dictionaries": None,
},
"custom_vars" : {
"jsoncpp": "http://svn.code.sf.net/p/jsoncpp/code",
},
},
]