- 18 Sep, 2018 8 commits
-
-
Georg Neis authored
Bug: v8:7790 Change-Id: Ic48c7d869d98b64195f699c47b1a250ae6ad2440 Reviewed-on: https://chromium-review.googlesource.com/1227127Reviewed-by: Jaroslav Sevcik <jarin@chromium.org> Reviewed-by: Maya Lekova <mslekova@chromium.org> Cr-Commit-Position: refs/heads/master@{#55982}
-
Georg Neis authored
I'm also changing the function signature to take the descriptor_index instead of the FieldIndex, because this lets me reuse the vector of property descriptors as storage. Bug: v8:7790 Change-Id: Ie9dadcba2204b6825e5791f9c630fc8b1079a930 Reviewed-on: https://chromium-review.googlesource.com/1227873 Commit-Queue: Georg Neis <neis@chromium.org> Reviewed-by: Jaroslav Sevcik <jarin@chromium.org> Reviewed-by: Maya Lekova <mslekova@chromium.org> Cr-Commit-Position: refs/heads/master@{#55981}
-
Florian Sattler authored
Fixing clang-tidy warning. Bug: v8:8015 Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;master.tryserver.blink:linux_trusty_blink_rel Change-Id: I82a169545724fca7757b2fce6b64b56d1b6264ba Reviewed-on: https://chromium-review.googlesource.com/1225794Reviewed-by: Yang Guo <yangguo@chromium.org> Commit-Queue: Florian Sattler <sattlerf@google.com> Cr-Commit-Position: refs/heads/master@{#55980}
-
Florian Sattler authored
Fixing clang-tidy warning. Bug: v8:8015 Change-Id: If912b9d43f577ca3e9f3b8b27acf957c49e269dc Reviewed-on: https://chromium-review.googlesource.com/1224113Reviewed-by: Yang Guo <yangguo@chromium.org> Commit-Queue: Florian Sattler <sattlerf@google.com> Cr-Commit-Position: refs/heads/master@{#55979}
-
Florian Sattler authored
Fixing clang-tidy warning. Bug: v8:8015 Change-Id: I46b96899f0a5973f2fbf8af94eb43d14955a3f45 Reviewed-on: https://chromium-review.googlesource.com/1227072Reviewed-by: Yang Guo <yangguo@chromium.org> Commit-Queue: Florian Sattler <sattlerf@google.com> Cr-Commit-Position: refs/heads/master@{#55978}
-
Florian Sattler authored
Fixing clang-tidy warning. Bug: v8:8015 Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;master.tryserver.blink:linux_trusty_blink_rel Change-Id: I641c72959470471747221f94da545a053dfcc0b0 Reviewed-on: https://chromium-review.googlesource.com/1228064Reviewed-by: Yang Guo <yangguo@chromium.org> Commit-Queue: Florian Sattler <sattlerf@google.com> Cr-Commit-Position: refs/heads/master@{#55977}
-
Florian Sattler authored
Fixing clang-tidy warning. Bug: v8:8015 Cq-Include-Trybots: luci.chromium.try:linux_chromium_rel_ng Change-Id: I2204967cff3e50d967a9c6f4685f0df5a6ba84af Reviewed-on: https://chromium-review.googlesource.com/1226793Reviewed-by: Toon Verwaest <verwaest@chromium.org> Reviewed-by: Yang Guo <yangguo@chromium.org> Commit-Queue: Florian Sattler <sattlerf@google.com> Cr-Commit-Position: refs/heads/master@{#55976}
-
v8-ci-autoroll-builder authored
Rolling v8/build: https://chromium.googlesource.com/chromium/src/build/+log/dc14f7b..c4b8ad9 Rolling v8/third_party/catapult: https://chromium.googlesource.com/catapult/+log/c9dc040..460fd88 Rolling v8/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools/+log/2174136..ea4301e Rolling v8/tools/clang: https://chromium.googlesource.com/chromium/src/tools/clang/+log/9bd40b2..b170cc8 TBR=machenbach@chromium.org,hablich@chromium.org,sergiyb@chromium.org Change-Id: Ia2de587c342206cebb46cc65e72f378e2e1303c6 Reviewed-on: https://chromium-review.googlesource.com/1229616Reviewed-by: V8 Autoroller <v8-ci-autoroll-builder@chops-service-accounts.iam.gserviceaccount.com> Commit-Queue: V8 Autoroller <v8-ci-autoroll-builder@chops-service-accounts.iam.gserviceaccount.com> Cr-Commit-Position: refs/heads/master@{#55975}
-
- 17 Sep, 2018 32 commits
-
-
Sathya Gunasekaran authored
Add tests. Bug: v8:5367 Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;master.tryserver.blink:linux_trusty_blink_rel Change-Id: I2a4215a87ba1dae98c4b25547494165f534b4a66 Reviewed-on: https://chromium-review.googlesource.com/1218046 Commit-Queue: Sathya Gunasekaran <gsathya@chromium.org> Reviewed-by: Adam Klein <adamk@chromium.org> Reviewed-by: Yang Guo <yangguo@chromium.org> Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org> Reviewed-by: Mythri Alle <mythria@chromium.org> Cr-Commit-Position: refs/heads/master@{#55974}
-
Junliang Yan authored
R=joransiu@ca.ibm.com Change-Id: I975eb3eb0e896b4409e923638f5644dd404e8689 Reviewed-on: https://chromium-review.googlesource.com/1228640Reviewed-by: Joran Siu <joransiu@ca.ibm.com> Commit-Queue: Junliang Yan <jyan@ca.ibm.com> Cr-Commit-Position: refs/heads/master@{#55973}
-
Bill Budge authored
- Removes ApiNativeType enum, using InstanceType instead. - Replaces switch with JSObject::GetInstanceSize call. Bug: v8:8015 Change-Id: I1c952792a068ec4f46a03ec47dce578d632e7cc3 Reviewed-on: https://chromium-review.googlesource.com/1199905Reviewed-by: Toon Verwaest <verwaest@chromium.org> Commit-Queue: Bill Budge <bbudge@chromium.org> Cr-Commit-Position: refs/heads/master@{#55972}
-
Junliang Yan authored
Port 0c296cb2 Original Commit Message: This change introduces the necessary conversion operators to convert from Word64 to other representations (Tagged, Word32, Float64, etc.), and plugs in the Word64 representation for NumberAdd/NumberSubtract, such that TurboFan will go to Int64Add/Sub on 64-bit architectures when the inputs and the output of the operation is in safe integer range. This includes the necessary changes to the Deoptimizer to be able to rematerialize Int64 values as Smi/HeapNumber when going back to Ignition later. This change might affect performance, although measurements indicate that there should be no noticable performance impact. The goal is to have TurboFan support Word64 representation to a degree that changing the TypedArray length to an uint64_t (for 64-bit archs) becomes viable and doesn't have any negative performance implications. Independent of that we might get performance improvements in other areas such as for crypto code later. R=bmeurer@chromium.org, joransiu@ca.ibm.com, michael_dawson@ca.ibm.com BUG= LOG=N Change-Id: I2119f156c4ddf942ea09ff8ed52e1c6cb32477f2 Reviewed-on: https://chromium-review.googlesource.com/1228634Reviewed-by: Joran Siu <joransiu@ca.ibm.com> Commit-Queue: Junliang Yan <jyan@ca.ibm.com> Cr-Commit-Position: refs/heads/master@{#55971}
-
Junliang Yan authored
Port 6346cdb6 Original Commit Message: This adds support to TurboFan's representation selection for the Word64 representation, and makes use of that to handle indices for memory access and allocation instructions (i.e. LoadElement, StoreElement, Allocate, etc.). These instructions had previously used Word32 as representation for the indices / sizes, and then internally converted it to the correct representation (aka Word64 on 64-bit architectures) later on, but that was kind of brittle, and sometimes led to weird generated code. The change thus only adds support to convert integer values in the safe integer range from all kinds of representations to Word64 (on 64-bit architectures). We don't yet handle the opposite direction and none of the representation selection heuristics for the numeric operations were changed so far. This will be done in follow-up CLs. This CL itself is supposed to be neutral wrt. functionality, and only serves as a starting point, and a cleanup for the (weird) implicit Word64 index/size handling. R=bmeurer@chromium.org, joransiu@ca.ibm.com, michael_dawson@ca.ibm.com BUG= LOG=N Change-Id: Ic7ea30639dea3c5f8a59e7100a15d5ed50073c20 Reviewed-on: https://chromium-review.googlesource.com/1228416Reviewed-by: Joran Siu <joransiu@ca.ibm.com> Commit-Queue: Junliang Yan <jyan@ca.ibm.com> Cr-Commit-Position: refs/heads/master@{#55970}
-
Creddy authored
Temporarily disable one-shot optimization for debug-evaluate-no-side-effect-builtins-2 to fix the gc stress test. This issue will be fixed in the future CL (https://chromium-review.googlesource.com/c/v8/v8/+/1196725) that adds new bytecodes for loads and stores and one-shot optimizations will be enabled again. Change-Id: I6475557778da4553b5b6cbba1fda14c52d3dd91b Reviewed-on: https://chromium-review.googlesource.com/1228063Reviewed-by: Igor Sheludko <ishell@chromium.org> Commit-Queue: Chandan Reddy <chandanreddy@google.com> Cr-Commit-Position: refs/heads/master@{#55969}
-
Benedikt Meurer authored
On Intel platforms, the kX64Cmp32 and kX64Test32 operations in TurboFan's backend automatically truncate their inputs to Word32 (aka they don't look at the upper bits), so the instruction selection can silently ignore TruncateInt64ToInt32 on the inputs. Bug: v8:8178 Change-Id: Ia50a38cac927e5b2155f092a8885da255a3dddca Reviewed-on: https://chromium-review.googlesource.com/1227935Reviewed-by: Sigurd Schneider <sigurds@chromium.org> Commit-Queue: Benedikt Meurer <bmeurer@chromium.org> Cr-Commit-Position: refs/heads/master@{#55968}
-
Alexei Filippov authored
Change-Id: I3d16a1e03a28a4ebd69b891cdb610e66230c9c3e Reviewed-on: https://chromium-review.googlesource.com/1227421Reviewed-by: Michael Lippautz <mlippautz@chromium.org> Commit-Queue: Alexei Filippov <alph@chromium.org> Cr-Commit-Position: refs/heads/master@{#55967}
-
Alexei Filippov authored
Change-Id: Ib13782a8f5eea793b9a74d6f72c625a050069dc2 Reviewed-on: https://chromium-review.googlesource.com/1227681Reviewed-by: Michael Lippautz <mlippautz@chromium.org> Commit-Queue: Alexei Filippov <alph@chromium.org> Cr-Commit-Position: refs/heads/master@{#55966}
-
Florian Sattler authored
Fixing clang-tidy warning. Bug: v8:8015 Change-Id: Ibdb4b81e1ba764d73bac6592eeef5783097076fc Reviewed-on: https://chromium-review.googlesource.com/1225896Reviewed-by: Hannes Payer <hpayer@chromium.org> Commit-Queue: Florian Sattler <sattlerf@google.com> Cr-Commit-Position: refs/heads/master@{#55965}
-
Adam Klein authored
Instead include it in the files that need to use it. Change-Id: I2321f423ddcc1c0e779332c2e7d1a372bfb4ebbb Reviewed-on: https://chromium-review.googlesource.com/1227305Reviewed-by: Ulan Degenbaev <ulan@chromium.org> Commit-Queue: Adam Klein <adamk@chromium.org> Cr-Commit-Position: refs/heads/master@{#55964}
-
Clemens Hammacher authored
R=ahaas@chromium.org Bug: v8:8158 Change-Id: Ifb00cd7b106f1ac5614acfb5ff7c2e8c0a9b0170 Reviewed-on: https://chromium-review.googlesource.com/1228055Reviewed-by: Andreas Haas <ahaas@chromium.org> Commit-Queue: Clemens Hammacher <clemensh@chromium.org> Cr-Commit-Position: refs/heads/master@{#55963}
-
Michael Starzinger authored
This avoids unnecessary stack-walks to determine the current context in WebAssembly runtime functions, in cases where the calling stub already determined the calling instance and can just set the context register itself before calling into the runtime. R=clemensh@chromium.org Change-Id: Iba02d479a7dad8907195bf94efb9d559be20a6d1 Reviewed-on: https://chromium-review.googlesource.com/1228035Reviewed-by: Clemens Hammacher <clemensh@chromium.org> Commit-Queue: Michael Starzinger <mstarzinger@chromium.org> Cr-Commit-Position: refs/heads/master@{#55962}
-
Clemens Hammacher authored
js-to-wasm wrappers check whether trap handlers are enabled process-wide, but are independent of their actual usage in the current instance. Thus remove this unneeded parameter. R=mstarzinger@chromium.org Bug: chromium:862123 Change-Id: I3793213864568b4e26eb3414239033491e4539f5 Reviewed-on: https://chromium-review.googlesource.com/1226974 Commit-Queue: Clemens Hammacher <clemensh@chromium.org> Reviewed-by: Michael Starzinger <mstarzinger@chromium.org> Cr-Commit-Position: refs/heads/master@{#55961}
-
Ivica Bogosavljevic authored
Port 0c296cb2 Change-Id: Ic90f248e05a668cfda6f6a86772dcabbc5275ec0 Reviewed-on: https://chromium-review.googlesource.com/1228034Reviewed-by: Sreten Kovacevic <skovacevic@wavecomp.com> Commit-Queue: Sreten Kovacevic <skovacevic@wavecomp.com> Cr-Commit-Position: refs/heads/master@{#55960}
-
Michael Starzinger authored
This is a reland of a4105a43 Original change's description: > [wasm] Implement handling of exported/imported exceptions. > > This implements the proper semantics for matching exported/imported > exceptions by using the notion of an "exception tag" that is global to > the system. It can be used to match exceptions in one module against > exceptions declared and/or thrown in another module (or instance). > > R=clemensh@chromium.org > TEST=mjsunit/wasm/exceptions-shared > BUG=v8:8091 > > Change-Id: I37586d7be5d5e6169b3418dfbc415b26dd4750dd > Reviewed-on: https://chromium-review.googlesource.com/1226976 > Commit-Queue: Michael Starzinger <mstarzinger@chromium.org> > Reviewed-by: Clemens Hammacher <clemensh@chromium.org> > Cr-Commit-Position: refs/heads/master@{#55940} Bug: v8:8091 Change-Id: Ib85f099b26a8323a8a00299b5aaeb05aaff3c3c6 Reviewed-on: https://chromium-review.googlesource.com/1227975Reviewed-by: Clemens Hammacher <clemensh@chromium.org> Commit-Queue: Michael Starzinger <mstarzinger@chromium.org> Cr-Commit-Position: refs/heads/master@{#55959}
-
Benedikt Meurer authored
Cleanup the JSArrayBuffer bit fields to use the proper object macros that are now otherwise used consistently across the code base. Also change TurboFan to consistently bailout when it sees an array buffer that was previously neutered, so that the generic path / builtins are again the chokepoints for the spec violations (the fact that we don't always raise exceptions when we see a neutered array buffer), except for the ArrayBufferView accessor inlining in the JSCallReducer, where we still turn the values into zero (because we don't have access to a CALL_IC speculation guard in the common case). This also removes the ArrayBufferWasNeutered simplified operator, and does regular LoadField + Number bitwise operations instead, which is good enough and allows us to get rid of a lot of unnecessary complexity. Bug: v8:4153, v8:7881, v8:8015, v8:8171, v8:8178 Change-Id: I4ce79ece762c632e6318f2ab7bcc6b2f82383947 Reviewed-on: https://chromium-review.googlesource.com/1226887Reviewed-by: Georg Neis <neis@chromium.org> Commit-Queue: Benedikt Meurer <bmeurer@chromium.org> Cr-Commit-Position: refs/heads/master@{#55958}
-
Igor Sheludko authored
Bug: v8:8015 Cq-Include-Trybots: luci.chromium.try:linux_chromium_rel_ng Change-Id: I2ce078b662e3dd93e0fac310b0d73c4cadbaccb3 Reviewed-on: https://chromium-review.googlesource.com/1226640 Commit-Queue: Igor Sheludko <ishell@chromium.org> Reviewed-by: Michael Lippautz <mlippautz@chromium.org> Cr-Commit-Position: refs/heads/master@{#55957}
-
Florian Sattler authored
Fixing clang-tidy warning. Bug: v8:8015 Change-Id: I7d885f0e2ba3cdf97de190166dc4cdd24dc0c11e Reviewed-on: https://chromium-review.googlesource.com/1224091 Commit-Queue: Florian Sattler <sattlerf@google.com> Reviewed-by: Michael Starzinger <mstarzinger@chromium.org> Cr-Commit-Position: refs/heads/master@{#55956}
-
Clemens Hammacher authored
We still see occasions of "WebAssembly Instantiation: Out of memory: wasm memory", e.g. on the N5X arm64 bot. We already have a retry-loop around the {ReserveAddressSpace} call, so this error can only happen if {AllocatePages} fails. I cannot easily reproduce, so I will land this CL and hope that it fixes the flake. We might eventually replace all these gc-then-retry loops by a better mechanism which knows about process-wide allocations. Currently, {AllocatePages} is isolate-independent, and only calls {Platform::OnCriticalMemoryPressure}, but this call does nothing on the default platform. So trigger a GC on the current isolate instead. R=mlippautz@chromium.org Bug: chromium:883639, v8:7872, v8:8158 Change-Id: Ib4e4a4a5f6b598d5832c327b1fc83ccb3bada9bc Reviewed-on: https://chromium-review.googlesource.com/1226886Reviewed-by: Michael Lippautz <mlippautz@chromium.org> Commit-Queue: Clemens Hammacher <clemensh@chromium.org> Cr-Commit-Position: refs/heads/master@{#55955}
-
Michael Starzinger authored
R=clemensh@chromium.org TEST=mjsunit/wasm/exceptions BUG=v8:8091 Change-Id: I93227c29bb3591983f1901577afdf305637beb70 Reviewed-on: https://chromium-review.googlesource.com/1226803 Commit-Queue: Michael Starzinger <mstarzinger@chromium.org> Reviewed-by: Clemens Hammacher <clemensh@chromium.org> Cr-Commit-Position: refs/heads/master@{#55954}
-
Igor Sheludko authored
Only read-only pages don't have properly initialized reservation object. This is a reland of b0edf8e6 Bug: v8:8096 Change-Id: Ib2745d18e93788b92b0f9ffcaf996a1dad886b04 Reviewed-on: https://chromium-review.googlesource.com/1226875 Commit-Queue: Igor Sheludko <ishell@chromium.org> Reviewed-by: Ulan Degenbaev <ulan@chromium.org> Cr-Commit-Position: refs/heads/master@{#55953}
-
Igor Sheludko authored
... in order to avoid page allocator filtering when notifying leak sanitizer. This is a reland of 0606bf91 Bug: v8:8015 Change-Id: I314eee7699ce2c8abeeafce4fcf185810ac252a9 Reviewed-on: https://chromium-review.googlesource.com/1226918 Commit-Queue: Igor Sheludko <ishell@chromium.org> Reviewed-by: Ulan Degenbaev <ulan@chromium.org> Cr-Commit-Position: refs/heads/master@{#55952}
-
Creddy authored
We do not have to collect feedback for function calls in one-shot code. This CL avoids allocating CallICslots for each function call by emitting CallNoFeedback bytecodes. We save one CallICSlot (two entries in feedback vector) per function call in One-shot. Bug: v8:8072 Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;master.tryserver.blink:linux_trusty_blink_rel Change-Id: Ic2580e5972acd5124c2e71d540985736ce797fe8 Reviewed-on: https://chromium-review.googlesource.com/1178051 Commit-Queue: Chandan Reddy <chandanreddy@google.com> Reviewed-by: Ross McIlroy <rmcilroy@chromium.org> Reviewed-by: Camillo Bruni <cbruni@chromium.org> Reviewed-by: Jaroslav Sevcik <jarin@chromium.org> Cr-Commit-Position: refs/heads/master@{#55951}
-
Benedikt Meurer authored
The computation to find the hash entry is already performed on Word64, and the actual value access later is also performed on Word64 indices, so there's no point to go to Word32 in between. Bug: v8:8015, v8:8178 Change-Id: I160e02166beceb79dcc8e69f9c365871a4c42606 Reviewed-on: https://chromium-review.googlesource.com/1226648Reviewed-by: Jaroslav Sevcik <jarin@chromium.org> Commit-Queue: Benedikt Meurer <bmeurer@chromium.org> Cr-Commit-Position: refs/heads/master@{#55950}
-
Michael Lippautz authored
Abort incremental marking pulls in the requirement to also be able to abort on the embedder side. In practice, aborting is never really needed and the GC should just finalize the existing collection and do an atomic followup if exact marking information is required. Bug: chromium:843903 Cq-Include-Trybots: luci.chromium.try:linux_chromium_rel_ng Change-Id: Ic471332d01b0c4be26b71a06248af03255c61a9d Reviewed-on: https://chromium-review.googlesource.com/1225705Reviewed-by: Ulan Degenbaev <ulan@chromium.org> Reviewed-by: Yang Guo <yangguo@chromium.org> Commit-Queue: Michael Lippautz <mlippautz@chromium.org> Cr-Commit-Position: refs/heads/master@{#55949}
-
Georg Neis authored
Also properly implement MapRef::GetInObjectPropertyOffset. Bug: v8:7790 Change-Id: I3e73247df67b7c40336b6c685b784dbf9e542340 Reviewed-on: https://chromium-review.googlesource.com/1226977 Commit-Queue: Georg Neis <neis@chromium.org> Reviewed-by: Jaroslav Sevcik <jarin@chromium.org> Reviewed-by: Maya Lekova <mslekova@chromium.org> Cr-Commit-Position: refs/heads/master@{#55948}
-
Clemens Hammacher authored
VirtualMemory objects can be moved since https://crrev.com/c/1213062, so there is no need any more to return them via pointer argument. This also makes the {AllocVirtualMemory} and {AlignedAllocVirtualMemory} functions superfluous. R=ishell@chromium.org, titzer@chromium.org Bug: v8:8015 Change-Id: Id72921e1c66a6c10be6647194603b8283e010e24 Reviewed-on: https://chromium-review.googlesource.com/1226972Reviewed-by: Michael Lippautz <mlippautz@chromium.org> Reviewed-by: Ben Titzer <titzer@chromium.org> Reviewed-by: Igor Sheludko <ishell@chromium.org> Commit-Queue: Clemens Hammacher <clemensh@chromium.org> Cr-Commit-Position: refs/heads/master@{#55947}
-
Marja Hölttä authored
It's the same as BytecodeArray::BodyDescriptor. BUG=v8:7308 Change-Id: I3821108cc6cc577261ce58cd034e21dfbe2c3c87 Reviewed-on: https://chromium-review.googlesource.com/1227126Reviewed-by: Michael Lippautz <mlippautz@chromium.org> Commit-Queue: Marja Hölttä <marja@chromium.org> Cr-Commit-Position: refs/heads/master@{#55946}
-
Georg Neis authored
Bug: v8:7790 Change-Id: I993d04e6ca6b8986749bb3782113ef928952995b Reviewed-on: https://chromium-review.googlesource.com/1226975 Commit-Queue: Georg Neis <neis@chromium.org> Reviewed-by: Jaroslav Sevcik <jarin@chromium.org> Reviewed-by: Maya Lekova <mslekova@chromium.org> Cr-Commit-Position: refs/heads/master@{#55945}
-
Florian Sattler authored
Fixing clang-tidy warning. Bug: v8:8015 Change-Id: If115a71b1c57eecdec7c57d3613a4f0bd90f2e66 Reviewed-on: https://chromium-review.googlesource.com/1226791Reviewed-by: Andreas Haas <ahaas@chromium.org> Commit-Queue: Florian Sattler <sattlerf@google.com> Cr-Commit-Position: refs/heads/master@{#55944}
-
Benedikt Meurer authored
For NumberAdd/Subtract/Multiply we currently onlt consult the upper bound to decide whether to compute using Int32 or Float64 operations, whereas for NumberModulus, NumberEqual, etc. we do decide based on the feedback types, where the only significant difference is that we cannot promise Word32 truncations on the inputs. This change unifies the handling for NumberAdd/Subtract/Multiply as well, which triggers surprisingly often in our core benchmark suites.. Bug: v8:8015 Change-Id: If8ec1bc82d1e1b71285c829262a0d343a4eb2af7 Reviewed-on: https://chromium-review.googlesource.com/1226033 Commit-Queue: Benedikt Meurer <bmeurer@chromium.org> Reviewed-by: Jaroslav Sevcik <jarin@chromium.org> Cr-Commit-Position: refs/heads/master@{#55943}
-