GitLab

@IntDef/@StringDef annotation are preferred way for declaring
set of String/int values

1. they need less space in APK than enum, see
https://developer.android.com/topic/performance/reduce-apk-size#remove-enums
2. they give more control over allowed values than "static final" values

Patch is updating HWEncoderProperties to @IntDef with form common with other Chrome @IntDef:

1. with @IntDef first, @Retention second
   and related @interface third
2. with values inside @interface
3. with @Retention(RetentionPolicy.SOURCE)
4. without "static final" in the @interface
5. with NUM_ENTRIES

BUG=919666

Change-Id: I3dac5daa74145708436f63c6a8af0f50136addc3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1545928
Commit-Queue: Marcin Wiącek <marcin@mwiacek.com>
Reviewed-by: John Rummell <jrummell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646607}

Wasm is a 32-bit system, and hence uses 32-bit integers. Restrict the
input image length (a JS int) to << 32-bits (2^30 for now).

Bug: 935285
Change-Id: I2d523e49b2392fb49f8b25e9b77e8334532b5b5e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1546803Reviewed-by: Alex Danilo <adanilo@chromium.org>
Reviewed-by: Luciano Pacheco <lucmult@chromium.org>
Commit-Queue: Noel Gordon <noel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646606}

This driver upgrade is underway and using the Swarming-side solution
to send traffic to both the old and new driver versions.

Bug: 920665
Bug: 927414
Change-Id: Idc3fd9aa97335621ea7d3db44a1502d1be68d002
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1548388Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646605}

Change-Id: I99aab3b42cc7d09fbcaabe6ab0cc41739c1bd556
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1526438Reviewed-by: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
Commit-Queue: Aran Gilman <gilmanmh@google.com>
Cr-Commit-Position: refs/heads/master@{#646604}

Because Switch Access (the feature) is behind a flag, this setting
should only show when that flag is enabled.

Bug: 948084
Change-Id: I60f4a8e072be656045e920fb5ee39fec8490e031
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1548363
Auto-Submit: Anastasia Helfinstein <anastasi@google.com>
Reviewed-by: Mitsuru Oshima <oshima@chromium.org>
Commit-Queue: Anastasia Helfinstein <anastasi@google.com>
Cr-Commit-Position: refs/heads/master@{#646603}

BUG=None

Change-Id: I46a53f84f4017d2b30bdfbe8f100187eaeba6010
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1546648Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646602}

As advised in [1], this CL removes unnecessary Foo::Create() factory functions
which return an instance created by MakeGarbageCollected<Foo> in
//third_party/blink/renderer/core/layout, then this CL makes the callers
use MakeGarbageCollected<Foo> instead of Foo::Create() factory functions.

Additionally, this CL cleans up them in core/intersection_observer and core/invisible_dom
as well.

[1] https://groups.google.com/a/chromium.org/forum/#!msg/blink-dev/iJ1bawbxbWs/vEdfT5QtBgAJ

Bug: 939691
Change-Id: I6b1f0b35ce48275f1eb746b265d5c52e91cf4df4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1547531Reviewed-by: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Gyuyoung Kim <gyuyoung@igalia.com>
Cr-Commit-Position: refs/heads/master@{#646601}

This was only necessary for paged overflow for the viewport with
-webkit-paged-x which is now removed.

Bug: 940652
Change-Id: Id1d4a5b77fa1836106b677324450a3c06b331125
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1548473
Commit-Queue: Rune Lillesveen <futhark@chromium.org>
Commit-Queue: Ian Kilpatrick <ikilpatrick@chromium.org>
Reviewed-by: Ian Kilpatrick <ikilpatrick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646600}

Bug: 868561
Change-Id: I17995b34fc4b536720f895ba0e330293d9a49de1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1548364Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Commit-Queue: Maggie Chen <magchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646599}

https://pdfium.googlesource.com/pdfium.git/+log/010a4da72d17..7382a72a748f


git log 010a4da72d17..7382a72a748f --date=short --no-merges --format='%ad %ae %s'
2019-04-01 thestig@chromium.org Roll build/ e51ca1d98..c899486de (2 commits)
2019-04-01 tsepez@chromium.org Add single select box to field.fragment
2019-04-01 tsepez@chromium.org Add multiple select to field.fragment.
2019-04-01 thestig@chromium.org Sync third_party/yasm build files with Chromium's.
2019-04-01 tsepez@chromium.org Rename field.fragment subfields to more descriptive names
2019-04-01 tsepez@chromium.org Renumber JavaScript object in field.fragment
2019-04-01 tsepez@chromium.org Use span<> in more fxjs/xfa code.
2019-04-01 wnwen@chromium.org Rename android_tools to android_sdk


Created with:
  gclient setdep -r src/third_party/pdfium@7382a72a748f

The AutoRoll server is located here: https://autoroll.skia.org/r/pdfium-autoroll

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.



BUG=chromium:948150,chromium:948150,chromium:947060
TBR=dsinclair@chromium.org

Change-Id: Ic3c128b09de63e950888c860fb961ce5a38bd5d6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1548108Reviewed-by: chromium-autoroll <chromium-autoroll@skia-public.iam.gserviceaccount.com>
Commit-Queue: chromium-autoroll <chromium-autoroll@skia-public.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#646598}

This CL:
- Adds the "WebappSplashScreen.hidingAnimation" trace event which
  tracks the start and stop of the splash screen hide animation.
- Removes the "WebappSplashScreen" trace event because it is redudant
  with "WebappActivity.showSplash" and
  "WebappSplashScreen.hidingAnimation".

BUG=945784

Change-Id: If4e6513a288867b028c5a797d41ef32d754708e0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1547068Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646597}

+ Fix a crash on inflating vector drawable ic_add_circle_40dp in
  settings
+ Fix a bug on managed preference delegate that sets the icon to null
  on bind when the preference is not managed

Bug: 948267, 947905
Change-Id: Icd32fb599612ed980b6aa1bd8b2747de12bc8cff
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1548394
Commit-Queue: Becky Zhou <huayinz@chromium.org>
Reviewed-by: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646596}

Screenshots
1. focused email: https://screenshot.googleplex.com/SSjpDYjwm9C
2. focused name: https://screenshot.googleplex.com/UY7K1EndivM
3. focused street address: https://screenshot.googleplex.com/dVdx0p8AqDT
4. focused non-street address: https://screenshot.googleplex.com/AP3VGxgGt5T
5. focused phone: https://screenshot.googleplex.com/00x6eCP6BZw

Bug: 936168
Change-Id: I7c2e99fadb3d57dc6dfeec3af1d8c001f28be1e5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1542559
Commit-Queue: Caitlin Fischer <caitlinfischer@google.com>
Reviewed-by: Fabio Tirelo <ftirelo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646595}

This CL (hopefully) fixes a crash in IconLoadWaiter::RunCallback.
It looks like OnIconUpdated can get called after the timeout timer has
fired (before the delete is processed), causing the now null callback
to get executed. We avoid this by immediately deleting the object if
the timeout timer fires.

Bug: 941754
Change-Id: I21309cd34b04a7256e903927f4700fb03851cd4a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1546744Reviewed-by: Nicholas Verne <nverne@chromium.org>
Commit-Queue: Timothy Loh <timloh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646594}

This is a reland of 9d6b2ab9

Original change's description:
> overview: Move "No recent items" label out of shield widget.
> 
> Shield widget is getting removed. This is step one by moving the cannot
> snap window out into its own separate widget owned by overview_session.
> Since there is only ever one shown, it doesn't need to be owned by
> overviewGrid.
> 
> Test: ash_unittests OverviewSessionTest.*
> Bug: 942759
> Change-Id: I5c9e40763a35d27f2e383effada0f4f6d8791320
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1535131
> Reviewed-by: Xiaoqian Dai <xdai@chromium.org>
> Reviewed-by: Ahmed Fakhry <afakhry@chromium.org>
> Commit-Queue: Sammie Quon <sammiequon@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#644538}

Bug: 942759
Change-Id: Ied7f2e4ef9b7fe3d38055d58040d101378dff731
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1542557
Commit-Queue: Sammie Quon <sammiequon@chromium.org>
Reviewed-by: Xiaoqian Dai <xdai@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646593}

Style guidelines encourage using either BindOnce() or BindRepeating(),
not Bind(). This CL converts some Bind() calls to their respective
type.

Change-Id: I7e816bfd102f9e28989cff40003fc0f7192458d8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1546887
Commit-Queue: Kevin Bailey <krb@chromium.org>
Reviewed-by: Tommy Li <tommycli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646592}

Bug: 944115
Change-Id: I42573db7c4e99f21c9ef208aeb31e0a10b9f10f3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1548319
Auto-Submit: Tibor Goldschwendt <tiborg@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646591}

This CL :
1 - Disables the download auto-resumptions in native feature
2 - Adds a flag for testing purposes

Bug: 948299
Change-Id: I4a04eb17e61e40e9a4d471e1bfaccd77c0029270
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1547763Reviewed-by: Min Qin <qinmin@chromium.org>
Commit-Queue: Shakti Sahu <shaktisahu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646590}

Bug: chromium:698902
Change-Id: Ic2963f13439db4176e9650e6f111e42dbcc753d1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1548377Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Rakib Hasan <rmhasan@google.com>
Cr-Commit-Position: refs/heads/master@{#646589}

We want to be able to use smaller VMs for these tester-only machines,
and currently they're defaulting to requiring 8 cores.

This will be followed by a CL that removes this requirement for the
same VMs on the chromium.gpu waterfall.

Bug: 881625
Bug: 948220
No-Try: True
Change-Id: Iaf5400bfe7319be37a045b0cc781864eb6755f42
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1548545
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Jao-ke Chin-Lee <jchinlee@chromium.org>
Auto-Submit: Kenneth Russell <kbr@chromium.org>
Reviewed-by: Jao-ke Chin-Lee <jchinlee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646588}

The corresponding histograms were removed, but we forgot to remove
this bit of code.  Remove it.

Bug: 946853, 774526
Change-Id: Idfaf4f44083e97bb0082ada7f215ff3efb79a642
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1542671Reviewed-by: Hongchan Choi <hongchan@chromium.org>
Commit-Queue: Raymond Toy <rtoy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646587}

Add a new field in scripts to allow setting values to a form field with
keyboard presses simulation. This allows scripter to try different way if
some fields are not working with setting value directly.

Change-Id: I87818605fb156470606eb06bf3091da125f79c24
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1542053Reviewed-by: Mathias Carlen <mcarlen@chromium.org>
Reviewed-by: Clemens Arbesser <arbesser@google.com>
Commit-Queue: Hui Wu <wuandy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646586}

Bug: chromium:698902
Change-Id: I861eaa6596d2d9240f16514b2b6fe2287d0fd2ca
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1548132Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Rakib Hasan <rmhasan@google.com>
Cr-Commit-Position: refs/heads/master@{#646585}

String.append does an alloc and free on each append.

BUG=268281

Change-Id: Ie0cfdfd1741624afcbb82c0269acb772d2653411
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1545765Reviewed-by: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646584}

For some provider, a media status changed event was triggered by a
intermediate (probably caused by provider overriding the playback state)
where audio focus state is suspended while playback state is playing.

We considered this as invalid state and skip updating.

Bug: b:128037880
Change-Id: I9654eb4ac7b78c5c63ecba1dfefc9033ef9797a3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1546254
Commit-Queue: Li Lin <llin@chromium.org>
Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646583}

TBR=hbos@chromium.org

Bug: chromium:948055
Change-Id: I93faa0fc0b164a56fd34862c1c213c2a4305b474
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1547708Reviewed-by: Harald Alvestrand <hta@chromium.org>
Commit-Queue: Harald Alvestrand <hta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646582}

Previously symbolizer.py was using a for loop to read the symbolizer
output. Iterator implementation in File class adds buffering. As result
output was often shown on the screen with delay. Replaced for loop with
a while loop that invokes readline(), which avoids the buffering issue.

Bug: 943745
Change-Id: Ie37c2a001052aa38506a14e48035c382bda9e268
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1544621
Commit-Queue: Sergey Ulanov <sergeyu@chromium.org>
Commit-Queue: Kevin Marshall <kmarshall@chromium.org>
Reviewed-by: Kevin Marshall <kmarshall@chromium.org>
Auto-Submit: Sergey Ulanov <sergeyu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646581}

Bug: 945906
Change-Id: I4b085fa0a7f62b7b331ae99a48fb0a3dd5d46422
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1547533Reviewed-by: Theresa <twellington@chromium.org>
Commit-Queue: Sinan Sahin <sinansahin@google.com>
Cr-Commit-Position: refs/heads/master@{#646580}

Parameterized tests need to be careful not to allocate data before
WTF is initialized. Some NG Layout tests tried to work around this
by initializing partitions before accessing the WTF::operator<< which
calls ToString() on objects. Just replace the operator<< with a simple
test case string to avoid the complicated logic of trying to get
partitions and WTF initialized.

PaymentRequestDetails was marked as a fast malloc case and it really
should,'t be. It was working because of the partition initialization by
the layout tests. But when the test case is initialized by gtest it is
done before blink is initialized.

Change-Id: I4377aeb7b207392b794a4406089643cd5d2bbea1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1547346Reviewed-by: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646579}

All uses of these functions have been converted to NumberToString.

Bug: 929827
Change-Id: I60365fdf05f4b151dbf7230464d3ad98778273af
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1545881
Auto-Submit: Raul Tambre <raul@tambre.ee>
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646578}

Currently, skeleton generation of engaged sites is done by the navigation
throttle on every navigation. To make this more effective, this CL precomputes
skeletons in the lookalike service instead when it fetches the list of engaged
sites.

Change-Id: I252c8ebdcc21f7a91b7b40832fe664153ec10f3f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1546711
Commit-Queue: Mustafa Emre Acer <meacer@chromium.org>
Reviewed-by: Joe DeBlasio <jdeblasio@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646577}

There has been some flakiness in the UIA event-dump tests during recent
try-jobs.  It looks like most of the failures are due to spurious focus
events on the document object.

There was already a default filter rule to ignore these events for MSAA
tests; this change adds a rule to ignore the corresponding UIA event.

In addition, a number of tests using "continuations" receive spurious
focus events (on elements other than the document) at the start of a
new section.  This change filters out the focus events, which aren't
germane to the tests anyway.

Bug: 928949
Change-Id: If01a76aa36efe52fb6dd8f1c683c077d469efef6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1545081Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Commit-Queue: Ian Prest <iapres@microsoft.com>
Cr-Commit-Position: refs/heads/master@{#646576}

This can lead to two peers deadlocking, including between processes: If
peer A is sending lots of messages to peer B, and B's kernel message
queue attached to the receive port is full, A would block during the send.
If at the same time B were sending lots of messages to A, and A's kernel
message queue became full, B would also block. Neither A nor B would be
able to make process because the IO threads that would receive messages
are blocked in a send. (This assumes that only one thread is sending and
receiving for each peer).

Instead, MACH_SEND_MSG with 0 timeout. If the send times out, indicating
that the receiver's kernel message queue is full, set a flag to start
queueing future messages and arrange to re-send the failed one.

Bug: 932175
Change-Id: I8d2047485bffcabfecd2009b609d494f3c4b6551
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1544310Reviewed-by: Ken Rockot <rockot@google.com>
Commit-Queue: Robert Sesek <rsesek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646575}

This histogram is intended to report network only ad bytes for
the pageload. However, change
https://chromium-review.googlesource.com/c/chromium/src/+/1478091,
introduced a bug that caused it to record network and cache bytes.
This change fixes the error and versions the histogram. It also
adds a test to verify that only network bytes are recorded.

Change-Id: Ia97c0d4107562bfe7714abf14e9940acaa9645d3
Bug: 948130
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1544824Reviewed-by: Charlie Harrison <csharrison@chromium.org>
Commit-Queue: John Delaney <johnidel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646574}

Bug: 947738
Bug: 947834
Bug: 948171
Bug: 947032
Change-Id: Ic41418ef66e76375171ba3e36c660cada83ee0bd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1546858
Commit-Queue: Łukasz Anforowicz <lukasza@chromium.org>
Commit-Queue: Karan Bhatia <karandeepb@chromium.org>
Auto-Submit: Łukasz Anforowicz <lukasza@chromium.org>
Reviewed-by: Karan Bhatia <karandeepb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646573}

BUG=554299

Change-Id: Ic6d1418743812a444b80e101c2c73347e1f00f06
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1546159Reviewed-by: Bo <boliu@chromium.org>
Reviewed-by: Ken Rockot <rockot@google.com>
Reviewed-by: Peter Williamson <petewil@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Commit-Queue: Avi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646572}

Bug: 746182
Change-Id: Iaa0a2e5f7c3950f6fe2d1e1a1e14dd2d501311cd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1541584Reviewed-by: Frank Liberato <liberato@chromium.org>
Commit-Queue: Mounir Lamouri <mlamouri@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646571}

Bug: chromium:698902
Change-Id: I961197fde9627078743fb3b3dc76ff4a97bcae53
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1545228Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Rakib Hasan <rmhasan@google.com>
Cr-Commit-Position: refs/heads/master@{#646570}

Remove unused includes and add missing ones.

BUG=chromium:948309
TEST=code compiles

Change-Id: Idc271c561e0569ab4d87dd5b657bac1c5b460d49
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1547798Reviewed-by: Tommy Li <tommycli@chromium.org>
Commit-Queue: Maksim Ivanov <emaxx@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646569}

It's been unused since codereview.chromium.org/2518493002 .

BUG=chromium:948309

Change-Id: I8e11af84062d232a43f70af508debde98d935fb7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1547707Reviewed-by: Tommy Li <tommycli@chromium.org>
Commit-Queue: Maksim Ivanov <emaxx@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646568}