Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(245)

Issue 681713002: Update from chromium https://crrev.com/301315 (Closed)

Created:
6 years, 1 month ago by jamesr
Modified:
6 years, 1 month ago
CC:
mojo-reviews_chromium.org, qsr+mojo_chromium.org, viettrungluu+watch_chromium.org, yzshen+watch_chromium.org, abarth-chromium, Aaron Boodman, darin (slow to review), ben+mojo_chromium.org
Base URL:
https://github.com/domokit/mojo.git@master
Project:
mojo
Visibility:
Public.

Description

Update from chromium https://crrev.com/301315 This updates from chromium commit 060d7dc875cc41f46ab264181d1d622d02c3c8b7 aka commit position 301315. The following changes from earlier rolls are included: *) Remove gpu_media.patch, no longer needed thanks to https://crrev.com/301048 *) Added skia_build.patch to resolve blink dependency added by https://crrev.com/301105 *) Applied mojo changes for https://crrev.com/301165 TBR=ben@chromium.org Committed: https://chromium.googlesource.com/external/mojo/+/6165015eccc697c59a21ed139a526b78ab9426e6

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+4286 lines, -2776 lines) Patch
M base/BUILD.gn View 2 chunks +7 lines, -0 lines 0 comments Download
M base/base.gyp View 1 chunk +1 line, -0 lines 0 comments Download
M base/base.gypi View 1 chunk +6 lines, -0 lines 0 comments Download
M base/containers/hash_tables.h View 7 chunks +88 lines, -35 lines 0 comments Download
M base/containers/hash_tables_unittest.cc View 2 chunks +14 lines, -0 lines 0 comments Download
M base/containers/small_map_unittest.cc View 1 chunk +2 lines, -3 lines 0 comments Download
M base/files/file_path.h View 3 chunks +0 lines, -10 lines 0 comments Download
M base/mac/mac_util.h View 1 chunk +0 lines, -3 lines 0 comments Download
M base/mac/mac_util.mm View 1 chunk +0 lines, -13 lines 0 comments Download
M base/memory/discardable_memory.h View 2 chunks +6 lines, -1 line 0 comments Download
M base/memory/discardable_memory.cc View 1 chunk +2 lines, -1 line 0 comments Download
M base/memory/discardable_memory_android.cc View 5 chunks +17 lines, -1 line 0 comments Download
M base/memory/discardable_memory_ashmem.h View 1 chunk +1 line, -0 lines 0 comments Download
M base/memory/discardable_memory_ashmem.cc View 1 chunk +4 lines, -0 lines 0 comments Download
M base/memory/discardable_memory_emulated.h View 1 chunk +1 line, -0 lines 0 comments Download
M base/memory/discardable_memory_emulated.cc View 1 chunk +4 lines, -0 lines 0 comments Download
M base/memory/discardable_memory_linux.cc View 4 chunks +17 lines, -1 line 0 comments Download
M base/memory/discardable_memory_mac.cc View 4 chunks +17 lines, -1 line 0 comments Download
M base/memory/discardable_memory_mach.h View 1 chunk +1 line, -0 lines 0 comments Download
M base/memory/discardable_memory_mach.cc View 1 chunk +4 lines, -0 lines 0 comments Download
M base/memory/discardable_memory_manager.h View 2 chunks +7 lines, -0 lines 0 comments Download
M base/memory/discardable_memory_manager.cc View 1 chunk +28 lines, -0 lines 0 comments Download
M base/memory/discardable_memory_manager_unittest.cc View 1 chunk +4 lines, -0 lines 0 comments Download
A + base/memory/discardable_memory_shmem.h View 2 chunks +14 lines, -17 lines 0 comments Download
A base/memory/discardable_memory_shmem.cc View 1 chunk +121 lines, -0 lines 0 comments Download
A base/memory/discardable_memory_shmem_allocator.h View 1 chunk +32 lines, -0 lines 0 comments Download
A base/memory/discardable_memory_shmem_allocator.cc View 1 chunk +58 lines, -0 lines 0 comments Download
M base/memory/discardable_memory_win.cc View 4 chunks +17 lines, -1 line 0 comments Download
A base/memory/discardable_shared_memory.h View 1 chunk +109 lines, -0 lines 0 comments Download
A base/memory/discardable_shared_memory.cc View 1 chunk +234 lines, -0 lines 0 comments Download
A base/memory/discardable_shared_memory_unittest.cc View 1 chunk +251 lines, -0 lines 0 comments Download
M base/strings/string_piece.h View 2 chunks +0 lines, -12 lines 0 comments Download
M base/sys_info_android.cc View 1 chunk +1 line, -2 lines 0 comments Download
M base/timer/timer.h View 1 chunk +6 lines, -0 lines 0 comments Download
M base/win/win_util.h View 1 chunk +21 lines, -1 line 0 comments Download
M base/win/win_util.cc View 1 chunk +7 lines, -12 lines 0 comments Download
M base/win/win_util_unittest.cc View 1 chunk +1 line, -1 line 0 comments Download
M build/android/buildbot/bb_device_steps.py View 3 chunks +9 lines, -17 lines 0 comments Download
M build/android/buildbot/bb_run_bot.py View 2 chunks +3 lines, -2 lines 0 comments Download
M build/android/gyp/pack_arm_relocations.py View 2 chunks +4 lines, -2 lines 0 comments Download
M build/android/pylib/constants.py View 2 chunks +18 lines, -1 line 0 comments Download
M build/android/test_runner.py View 16 chunks +75 lines, -16 lines 0 comments Download
M build/common.gypi View 4 chunks +4 lines, -4 lines 0 comments Download
M build/config/android/config.gni View 3 chunks +16 lines, -4 lines 0 comments Download
M build/config/android/internal_rules.gni View 2 chunks +3 lines, -3 lines 0 comments Download
M build/config/android/rules.gni View 4 chunks +19 lines, -1 line 0 comments Download
M build/get_landmines.py View 1 chunk +1 line, -0 lines 0 comments Download
M build/go/rules.gni View 1 chunk +2 lines, -1 line 0 comments Download
A build/json_schema_api.gni View 1 chunk +209 lines, -0 lines 0 comments Download
A build/json_schema_bundle_compile.gypi View 1 chunk +83 lines, -0 lines 0 comments Download
A build/json_schema_bundle_registration_compile.gypi View 1 chunk +78 lines, -0 lines 0 comments Download
A build/json_schema_compile.gypi View 1 chunk +123 lines, -0 lines 0 comments Download
A build/json_to_struct.gypi View 1 chunk +50 lines, -0 lines 0 comments Download
M build/secondary/tools/grit/grit_rule.gni View 1 chunk +4 lines, -0 lines 0 comments Download
M cc/layers/layer_impl.h View 1 chunk +1 line, -0 lines 0 comments Download
M cc/layers/layer_impl.cc View 1 chunk +2 lines, -0 lines 0 comments Download
M cc/layers/layer_impl_unittest.cc View 2 chunks +2 lines, -0 lines 0 comments Download
M cc/layers/picture_layer.cc View 1 chunk +4 lines, -5 lines 0 comments Download
M cc/layers/picture_layer_impl.cc View 1 chunk +1 line, -1 line 0 comments Download
M cc/layers/picture_layer_impl_unittest.cc View 2 chunks +36 lines, -2 lines 0 comments Download
M cc/layers/solid_color_layer_impl.h View 1 chunk +1 line, -1 line 0 comments Download
M cc/layers/solid_color_layer_impl.cc View 2 chunks +10 lines, -6 lines 0 comments Download
M cc/quads/render_pass.h View 1 chunk +0 lines, -8 lines 0 comments Download
M cc/surfaces/surface_id.h View 2 chunks +0 lines, -9 lines 0 comments Download
M cc/test/fake_picture_pile_impl.h View 1 chunk +4 lines, -0 lines 0 comments Download
M cc/test/layer_tree_test.h View 1 chunk +1 line, -0 lines 0 comments Download
M cc/test/layer_tree_test.cc View 1 chunk +1 line, -0 lines 0 comments Download
M cc/trees/layer_tree_host.cc View 1 chunk +0 lines, -8 lines 0 comments Download
M cc/trees/layer_tree_host_impl.h View 1 chunk +1 line, -1 line 0 comments Download
M cc/trees/layer_tree_host_impl.cc View 2 chunks +3 lines, -3 lines 0 comments Download
M cc/trees/layer_tree_host_impl_unittest.cc View 1 chunk +14 lines, -0 lines 0 comments Download
M cc/trees/layer_tree_host_unittest_context.cc View 2 chunks +73 lines, -2 lines 0 comments Download
M cc/trees/layer_tree_impl.cc View 4 chunks +8 lines, -1 line 0 comments Download
M cc/trees/single_thread_proxy.h View 1 chunk +1 line, -0 lines 0 comments Download
M cc/trees/single_thread_proxy.cc View 3 chunks +12 lines, -1 line 0 comments Download
M cc/trees/thread_proxy.cc View 1 chunk +1 line, -1 line 0 comments Download
M gin/function_template.h View 4 chunks +70 lines, -346 lines 0 comments Download
D gin/function_template.h.pump View 1 chunk +0 lines, -240 lines 0 comments Download
M gin/wrappable_unittest.cc View 3 chunks +4 lines, -4 lines 0 comments Download
M gpu/command_buffer/service/BUILD.gn View 1 chunk +4 lines, -3 lines 0 comments Download
M gpu/command_buffer/service/context_group.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M gpu/command_buffer/service/gles2_cmd_decoder.cc View 4 chunks +4 lines, -4 lines 0 comments Download
M gpu/command_buffer/service/gpu_switches.h View 1 chunk +1 line, -0 lines 0 comments Download
M gpu/command_buffer/service/gpu_switches.cc View 1 chunk +5 lines, -0 lines 0 comments Download
M gpu/command_buffer/service/in_process_command_buffer.cc View 3 chunks +12 lines, -10 lines 0 comments Download
M gpu/command_buffer/service/mailbox_manager.h View 1 chunk +14 lines, -51 lines 0 comments Download
D gpu/command_buffer/service/mailbox_manager.cc View 1 chunk +0 lines, -110 lines 0 comments Download
A gpu/command_buffer/service/mailbox_manager_impl.h View 1 chunk +63 lines, -0 lines 0 comments Download
A gpu/command_buffer/service/mailbox_manager_impl.cc View 1 chunk +71 lines, -0 lines 0 comments Download
A gpu/command_buffer/service/mailbox_manager_sync.h View 1 chunk +99 lines, -0 lines 0 comments Download
A gpu/command_buffer/service/mailbox_manager_sync.cc View 1 chunk +339 lines, -0 lines 0 comments Download
M gpu/command_buffer/service/mailbox_manager_unittest.cc View 17 chunks +216 lines, -64 lines 0 comments Download
D gpu/command_buffer/service/mailbox_synchronizer.h View 1 chunk +0 lines, -107 lines 0 comments Download
D gpu/command_buffer/service/mailbox_synchronizer.cc View 1 chunk +0 lines, -276 lines 0 comments Download
M gpu/command_buffer/service/texture_definition.h View 2 chunks +3 lines, -3 lines 0 comments Download
M gpu/command_buffer/service/texture_definition.cc View 2 chunks +13 lines, -3 lines 0 comments Download
M gpu/command_buffer/service/texture_manager.h View 1 chunk +2 lines, -1 line 0 comments Download
M gpu/command_buffer/tests/gl_manager.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M gpu/command_buffer_service.gypi View 1 chunk +4 lines, -3 lines 0 comments Download
M gpu/config/DEPS View 1 chunk +0 lines, -1 line 0 comments Download
M gpu/config/gpu_info.h View 4 chunks +32 lines, -1 line 0 comments Download
M gpu/config/gpu_info.cc View 3 chunks +21 lines, -0 lines 0 comments Download
M gpu/config/gpu_info_collector.cc View 1 chunk +2 lines, -0 lines 0 comments Download
M gpu/config/gpu_info_unittest.cc View 1 chunk +1 line, -0 lines 0 comments Download
M mojo/services/native_viewport/DEPS View 1 chunk +1 line, -1 line 0 comments Download
M mojo/services/native_viewport/main.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M mojo/shell/context.cc View 2 chunks +2 lines, -2 lines 0 comments Download
D mojo/tools/roll/gpu_media.patch View 1 chunk +0 lines, -92 lines 0 comments Download
A mojo/tools/roll/skia_build.patch View 1 chunk +30 lines, -0 lines 0 comments Download
M net/base/escape.h View 1 chunk +2 lines, -2 lines 0 comments Download
M net/base/escape.cc View 3 chunks +12 lines, -6 lines 0 comments Download
M net/base/escape_unittest.cc View 1 chunk +37 lines, -0 lines 0 comments Download
M net/base/net_log_logger.cc View 2 chunks +15 lines, -0 lines 0 comments Download
M net/dns/dns_hosts.h View 2 chunks +0 lines, -9 lines 0 comments Download
M net/http/http_server_properties.h View 4 chunks +2 lines, -19 lines 0 comments Download
M net/http/http_server_properties.cc View 1 chunk +1 line, -12 lines 0 comments Download
M net/http/http_server_properties_impl.h View 2 chunks +0 lines, -6 lines 0 comments Download
M net/http/http_server_properties_impl.cc View 3 chunks +1 line, -14 lines 0 comments Download
M net/http/http_server_properties_manager.h View 2 chunks +0 lines, -6 lines 0 comments Download
M net/http/http_server_properties_manager.cc View 9 chunks +3 lines, -39 lines 0 comments Download
M net/http/http_server_properties_manager_unittest.cc View 1 chunk +1 line, -2 lines 0 comments Download
M net/http/http_stream_factory_impl.cc View 1 chunk +1 line, -3 lines 0 comments Download
M net/http/http_stream_factory_impl_job.cc View 1 chunk +3 lines, -14 lines 0 comments Download
M net/http/transport_security_state_static.h View 1 chunk +774 lines, -773 lines 0 comments Download
M net/http/transport_security_state_static.json View 1 chunk +1 line, -0 lines 0 comments Download
M net/quic/quic_client_session.cc View 2 chunks +9 lines, -0 lines 0 comments Download
M net/quic/quic_flags.cc View 1 chunk +1 line, -1 line 0 comments Download
M net/socket/ssl_client_socket_nss.cc View 4 chunks +19 lines, -0 lines 0 comments Download
M net/spdy/spdy_framer.h View 1 chunk +6 lines, -24 lines 0 comments Download
M net/spdy/spdy_framer.cc View 8 chunks +11 lines, -7 lines 0 comments Download
M net/spdy/spdy_framer_test.cc View 11 chunks +29 lines, -15 lines 0 comments Download
M net/spdy/spdy_protocol.h View 1 chunk +1 line, -1 line 0 comments Download
M sandbox/linux/BUILD.gn View 1 chunk +3 lines, -0 lines 0 comments Download
M sandbox/linux/bpf_dsl/bpf_dsl.h View 3 chunks +2 lines, -45 lines 0 comments Download
M sandbox/linux/bpf_dsl/bpf_dsl.cc View 2 chunks +0 lines, -11 lines 0 comments Download
A sandbox/linux/bpf_dsl/bpf_dsl_forward.h View 1 chunk +42 lines, -0 lines 0 comments Download
M sandbox/linux/bpf_dsl/bpf_dsl_more_unittest.cc View 27 chunks +27 lines, -26 lines 0 comments Download
M sandbox/linux/bpf_dsl/bpf_dsl_unittest.cc View 9 chunks +9 lines, -8 lines 0 comments Download
A sandbox/linux/bpf_dsl/policy.h View 1 chunk +37 lines, -0 lines 0 comments Download
A + sandbox/linux/bpf_dsl/policy.cc View 1 chunk +8 lines, -8 lines 0 comments Download
M sandbox/linux/bpf_dsl/policy_compiler.h View 2 chunks +3 lines, -3 lines 0 comments Download
M sandbox/linux/bpf_dsl/policy_compiler.cc View 3 chunks +3 lines, -3 lines 0 comments Download
M sandbox/linux/sandbox_linux.gypi View 1 chunk +3 lines, -0 lines 0 comments Download
M sandbox/linux/seccomp-bpf-helpers/baseline_policy.h View 2 chunks +4 lines, -3 lines 0 comments Download
M sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc View 1 chunk +1 line, -0 lines 0 comments Download
M sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h View 1 chunk +1 line, -1 line 0 comments Download
M sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc View 1 chunk +1 line, -0 lines 0 comments Download
M sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h View 1 chunk +1 line, -1 line 0 comments Download
M sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc View 1 chunk +1 line, -0 lines 0 comments Download
M sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc View 4 chunks +5 lines, -7 lines 0 comments Download
M sandbox/linux/seccomp-bpf/bpf_tester_compatibility_delegate.h View 1 chunk +2 lines, -3 lines 0 comments Download
M sandbox/linux/seccomp-bpf/bpf_tests.h View 3 chunks +4 lines, -5 lines 0 comments Download
M sandbox/linux/seccomp-bpf/bpf_tests_unittest.cc View 5 chunks +5 lines, -6 lines 0 comments Download
M sandbox/linux/seccomp-bpf/errorcode_unittest.cc View 2 chunks +2 lines, -1 line 0 comments Download
M sandbox/linux/seccomp-bpf/sandbox_bpf.h View 4 chunks +4 lines, -4 lines 0 comments Download
M sandbox/linux/seccomp-bpf/sandbox_bpf.cc View 7 chunks +10 lines, -13 lines 0 comments Download
M sandbox/linux/seccomp-bpf/sandbox_bpf_test_runner.h View 2 chunks +4 lines, -2 lines 0 comments Download
M sandbox/linux/seccomp-bpf/sandbox_bpf_test_runner.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M sandbox/linux/seccomp-bpf/syscall_unittest.cc View 3 chunks +2 lines, -2 lines 0 comments Download
M sandbox/linux/seccomp-bpf/verifier.h View 2 chunks +2 lines, -2 lines 0 comments Download
M sandbox/linux/seccomp-bpf/verifier.cc View 2 chunks +2 lines, -1 line 0 comments Download
M skia/BUILD.gn View 1 chunk +1 line, -0 lines 0 comments Download
M skia/skia_common.gypi View 2 chunks +7 lines, -0 lines 0 comments Download
M skia/skia_library.gypi View 2 chunks +1 line, -8 lines 0 comments Download
A testing/android/junit/BUILD.gn View 1 chunk +27 lines, -0 lines 0 comments Download
M testing/android/junit/junit_test.gyp View 2 chunks +2 lines, -0 lines 0 comments Download
M testing/buildbot/chromium.fyi.json View 6 chunks +0 lines, -12 lines 0 comments Download
M testing/buildbot/chromium.linux.json View 4 chunks +0 lines, -8 lines 0 comments Download
M testing/buildbot/chromium.mac.json View 4 chunks +0 lines, -8 lines 0 comments Download
M testing/buildbot/chromium.memory.fyi.json View 1 chunk +0 lines, -2 lines 0 comments Download
M testing/buildbot/chromium.win.json View 4 chunks +0 lines, -8 lines 0 comments Download
A testing/buildbot/chromium_athena.json View 1 chunk +22 lines, -0 lines 0 comments Download
M testing/buildbot/chromium_trybot.json View 1 chunk +0 lines, -2 lines 0 comments Download
M testing/chromoting/browser_test_commands_linux.txt View 1 chunk +2 lines, -1 line 0 comments Download
M testing/scripts/telemetry_unittests.py View 1 chunk +1 line, -0 lines 0 comments Download
M third_party/libevent/BUILD.gn View 1 chunk +1 line, -1 line 0 comments Download
M third_party/libevent/libevent_nacl_nonsfi.gyp View 3 chunks +5 lines, -6 lines 0 comments Download
M third_party/mesa/mesa.gyp View 1 chunk +8 lines, -0 lines 0 comments Download
M third_party/modp_b64/BUILD.gn View 1 chunk +1 line, -1 line 0 comments Download
M tools/clang/scripts/update.py View 1 chunk +1 line, -1 line 0 comments Download
M tools/valgrind/chrome_tests.py View 3 chunks +0 lines, -18 lines 0 comments Download
M tools/valgrind/memcheck/suppressions.txt View 1 chunk +0 lines, -14 lines 0 comments Download
M ui/gl/gl.gyp View 2 chunks +9 lines, -0 lines 0 comments Download
M ui/gl/gl_surface_win.cc View 2 chunks +34 lines, -33 lines 0 comments Download
M ui/gl/gpu_switching_manager.h View 3 chunks +14 lines, -0 lines 0 comments Download
M ui/gl/gpu_switching_manager.cc View 1 chunk +12 lines, -0 lines 0 comments Download
A ui/gl/gpu_switching_observer.h View 1 chunk +20 lines, -0 lines 0 comments Download

Messages

Total messages: 3 (0 generated)
jamesr
6 years, 1 month ago (2014-10-27 06:23:16 UTC) #1
jamesr
Committed patchset #1 (id:1) manually as 6165015eccc697c59a21ed139a526b78ab9426e6.
6 years, 1 month ago (2014-10-27 06:25:00 UTC) #2
Ben Goodger (Google)
6 years, 1 month ago (2014-10-27 21:54:25 UTC) #3
Message was sent while issue was closed.
lgtm

Powered by Google App Engine
This is Rietveld 408576698