- 20 Jun, 2017 40 commits
-
-
https://goo.gl/kROfz5Findit authored
culprit for failures in the build cycles as shown on: https://findit-for-me.appspot.com/waterfall/culprit?key=ag9zfmZpbmRpdC1mb3ItbWVyRAsSDVdmU3VzcGVjdGVkQ0wiMWNocm9taXVtLzFhZWE3ODM3YTMxZDI1ZmI1ZTc0MjJjOTNhMmVmYmQxYTRiOGMzODgM TBR=dpapad@chromium.org,jochen@chromium.org,nyquist@chromium.org,mathp@chromium.org,gogerald@chromium.org,anthonyvd@chromium.org,pkasting@chromium.org,zea@chromium.org Change-Id: Ieb0fa227b6d22a3ff95cdc78f71de429a5baac15 Reviewed-on: https://chromium-review.googlesource.com/540793 Commit-Queue: Philip Rogers <pdr@chromium.org> Reviewed-by:
Philip Rogers <pdr@chromium.org> Reviewed-by:
Rouslan Solomakhin <rouslan@chromium.org> Cr-Commit-Position: refs/heads/master@{#480987}
-
ios-autoroller authored
TBR=smut Review-Url: https://codereview.chromium.org/2952733002 Cr-Commit-Position: refs/heads/master@{#480986}
-
creis authored
BUG=695189 CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_site_isolation Review-Url: https://codereview.chromium.org/2949853002 Cr-Commit-Position: refs/heads/master@{#480985}
-
allada authored
redirectSource was always a chain that linked to the previous redirect and could walk the chain from request to request. NetworkManager was setting "redirects" on the request and it was used in a few parts of the code but NetworkRequest never exposed it for use. Since redirects is not needed except when appending a new redirect to the chain I removed it and walked the chain instead for those cases. R=dgozman,pfeldman BUG=None Review-Url: https://codereview.chromium.org/2921053002 Cr-Commit-Position: refs/heads/master@{#480984}
-
pcc authored
This change causes the trybot to: - use ThinLTO - produce detailed diagnostics - produce symbolized stack traces. The goal is to reduce cycle times on the bot, as well as provide more details when it fails so that its results are more actionable. Tested by patching a bad cast into one of the base_unittests and sending a swarming job as described here: http://dev.chromium.org/developers/testing/isolated-testing/for-swes#TOC-Run-a-test-built-locally-on-Swarming BUG=732652 R=dpranke@chromium.org Review-Url: https://codereview.chromium.org/2938383004 Cr-Commit-Position: refs/heads/master@{#480983}
-
Hiroshige Hayashizaki authored
The |mime_type| argument is used only to determine ContentType, and set to a constant except when called from TextResourceDecoderBuilder. This CL makes Create() to take ContentType directly as an argument and moves DetermineContentType() to TextResourceDecoderBuilder.cpp. Bug: 725654, 732893 Change-Id: I582727705351a49d10ecffdfdd9c1578114b6321 Reviewed-on: https://chromium-review.googlesource.com/539957 Commit-Queue: Hiroshige Hayashizaki <hiroshige@chromium.org> Reviewed-by:
Kouhei Ueno <kouhei@chromium.org> Reviewed-by:
Takeshi Yoshino <tyoshino@chromium.org> Reviewed-by:
Kinuko Yasuda <kinuko@chromium.org> Reviewed-by:
Charlie Harrison <csharrison@chromium.org> Cr-Commit-Position: refs/heads/master@{#480982}
-
Scott Graham authored
Fuchsia doesn't implement readdir_r(), so it needed to use readdir(). However, readdir_r() is expected to be deprecated (see https://www.gnu.org/software/libc/manual/html_node/Reading_002fClosing-Directory.html), should be re-entrant anywhere we'd care about, and doesn't have the allocation-size limitation of readdir_r on the size of dirent for the file path. So, switch to readdir() on all POSIX. Ref: https://fuchsia.googlesource.com/magenta/+/master/system/ulib/mxio/unistd.c#1579 and the "de" structure it allocates. Fixes some of FileUtilTest.* on Fuchsia. Bug: 706592 Change-Id: I95e6d156c23ab11b1ac50053aa273c89c97a8449 Reviewed-on: https://chromium-review.googlesource.com/541619 Commit-Queue: Scott Graham <scottmg@chromium.org> Reviewed-by:
Nico Weber <thakis@chromium.org> Cr-Commit-Position: refs/heads/master@{#480981}
-
jsaul authored
BUG=734219 Review-Url: https://codereview.chromium.org/2945563003 Cr-Commit-Position: refs/heads/master@{#480980}
-
Gregory Chatzinoff authored
This reverts commit f6e429ff. Reason for revert: This CL broke a variety of external url tests on ipad 32-bit configs. Original change's description: > Remove custom resizing hooks in GoogleLandingVC > > GoogleLandingViewController used to have custom hooks to detect resizing events > or orientation changes. This CL removes them and only use the generic > UIViewController hooks. > It also change the NTP constraints for the logo and the omnibox: the constraint > and positioning is the same in landscape and portrait. The omnibox and doodle > are now higher in portrait. > > TEST= This CL refactors the NTP. Some regression testing should be done, in particular on rotations. > Issues for which specific fixes have been removed: crbug.com/491131 > On iPad and in fullscreen, the collection view's inset is very large. When Chrome enters slide over mode, > the previously set inset is larger than the newly set collection view's width, which makes the collection view throw an exception. > > Bug: 733166 > Change-Id: I2f6faf2468196cdd0a2faa191634b4da51254079 > Reviewed-on: https://chromium-review.googlesource.com/536915 > Commit-Queue: Gauthier Ambard <gambard@chromium.org> > Reviewed-by: Justin Cohen <justincohen@chromium.org> > Cr-Commit-Position: refs/heads/master@{#480453} TBR=justincohen@chromium.org,gambard@chromium.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: 733166 Change-Id: I2aebc9327489d4a89861507ae9dedb166054cf4b Reviewed-on: https://chromium-review.googlesource.com/541761Reviewed-by:
Gregory Chatzinoff <gchatz@chromium.org> Commit-Queue: Gregory Chatzinoff <gchatz@chromium.org> Cr-Commit-Position: refs/heads/master@{#480979}
-
thomasanderson authored
This roll includes 2 revisions [1] and should be a no-op on all bots. [1] https://chromium.googlesource.com/chromium/buildtools/+log/9a65473..b92ff91 R=thakis@chromium.org Review-Url: https://codereview.chromium.org/2948863002 Cr-Commit-Position: refs/heads/master@{#480978}
-
moshayedi authored
WindowEventDispatcher does the dispatch to InputMethod. BUG=NONE Review-Url: https://codereview.chromium.org/2943973003 Cr-Commit-Position: refs/heads/master@{#480977}
-
Peng Huang authored
In https://codereview.chromium.org/2868473002, we create CompositorFrameSink from aura::Window, and the CompositorFrameSink controls when to allocate a new cc::Surface, and exo doesn't explicitly create new cc::Surface anymore. So some methods related to creating new surface are not useful anymore, so remove them. Bug: 731742 Change-Id: If8ce2eda0143a7ce394c95d4d87fefbeebe2ebf1 Reviewed-on: https://chromium-review.googlesource.com/541456Reviewed-by:
Peng Huang <penghuang@chromium.org> Reviewed-by:
David Reveman <reveman@chromium.org> Commit-Queue: Peng Huang <penghuang@chromium.org> Cr-Commit-Position: refs/heads/master@{#480976}
-
Scott Graham authored
Recently added in https://codereview.chromium.org/2920223002/. This test was trying to test for failure in writing to "bad/../path", which in FilePath terms is "/path". On most POSIX OS's, this fails because / tends to not be writable, however Fuchsia's root is virtual so apps (at least currently) can successfully write there. Change the test path to "bad/../non_existent/path" so that the non-existence of /non_existent causes the file creation to fail. Bug: 706592 Change-Id: I5f8f22e59a0b157a9ec7f8309cc1175e4d9d0a79 Reviewed-on: https://chromium-review.googlesource.com/541677Reviewed-by:
Daniel Cheng <dcheng@chromium.org> Commit-Queue: Scott Graham <scottmg@chromium.org> Cr-Commit-Position: refs/heads/master@{#480975}
-
John Budorick authored
TBR=bpastene@chromium.org Bug: 670879 Change-Id: I4d254dc45b466276815e5e3e2b460ba056db1354 Reviewed-on: https://chromium-review.googlesource.com/540673Reviewed-by:
John Budorick <jbudorick@chromium.org> Reviewed-by:
Benjamin Pastene <bpastene@chromium.org> Commit-Queue: John Budorick <jbudorick@chromium.org> Cr-Commit-Position: refs/heads/master@{#480974}
-
dgozman authored
This is internal refactoring only, protocol does not expose an ability to connect multiple sessions yet. BUG=590878 Review-Url: https://codereview.chromium.org/2951833002 Cr-Commit-Position: refs/heads/master@{#480973}
-
Ben Goodger authored
Use new parameterized BinderRegistry. R=rockot@chromium.org Cq-Include-Trybots: master.tryserver.chromium.linux:linux_site_isolation Change-Id: I9f7e5cdf6802d45bdec83069e116cd99e0371022 Reviewed-on: https://chromium-review.googlesource.com/538998 Commit-Queue: Ben Goodger <ben@chromium.org> Reviewed-by:
Ken Rockot <rockot@chromium.org> Cr-Commit-Position: refs/heads/master@{#480972}
-
Fernando Serboncini authored
This still shares code with StyleBuilderConverter and FontBuilder. For that, we create a StyleBuilderConverterBase that is independent of ComputedStyle. Bug: 730692 Change-Id: I7792ef340a5f95782f57a94e093c3c7d73ad11b1 Reviewed-on: https://chromium-review.googlesource.com/531655 Commit-Queue: Fernando Serboncini <fserb@chromium.org> Reviewed-by:
Emil A Eklund <eae@chromium.org> Cr-Commit-Position: refs/heads/master@{#480971}
-
Tommy Martino authored
This reverts commit e8f9d07d. Reason for revert: Causing breakages -- https://build.chromium.org/p/chromium/builders/Android/builds/73527 Original change's description: > Remove Remoting API Key > > Chromoting host no longer needs API Key, so the key can be removed. > > Change-Id: I0960660ce2ddd5f4352ab691468d7c3881530d8d > Reviewed-on: https://chromium-review.googlesource.com/540035 > Reviewed-by: Roger Tawa <rogerta@chromium.org> > Reviewed-by: Joe Downing <joedow@chromium.org> > Commit-Queue: Sergey Ulanov <sergeyu@chromium.org> > Cr-Commit-Position: refs/heads/master@{#480940} TBR=rogerta@chromium.org,sergeyu@chromium.org,joedow@chromium.org Change-Id: Ibc4df105f77ad41a859663cbef76b73baa208a63 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://chromium-review.googlesource.com/541763Reviewed-by:
Tommy Martino <tmartino@chromium.org> Commit-Queue: Tommy Martino <tmartino@chromium.org> Cr-Commit-Position: refs/heads/master@{#480970}
-
Dongseong Hwang authored
This CL fixes chrome UI hang with --enable-drm-atomic on IA. When hang, the following error message is reported. [17889:17901:0619/140657.974833:ERROR:hardware_display_plane_manager_atomic.cc(78)] Failed to commit properties: Invalid argument It's because drmModeAtomicAddProperty() expects one of DRM_ROTATE_XXX as plane rotation value. ARM and Rockchip generously accept the invaild variable 0, but Intel doesn't. In addition, correct the local definition of DRM_ROTATE_XXX to match to the upstream kernel. https://chromium.googlesource.com/chromiumos/third_party/kernel/+/intel-graphics/syncfence_ams_npf_mst_607_r2/include/drm/drm_blend.h#37 TEST=run chromeos reef image using cros kernel intel-graphics/syncfence_ams_npf_mst_607_r2 branch BUG=b/36752417 Change-Id: I8abab16450cf79769692bd40de03a6005f5a024a Reviewed-on: https://chromium-review.googlesource.com/540656Reviewed-by:
Dongseong Hwang <dongseong.hwang@intel.com> Reviewed-by:
Daniele Castagna <dcastagna@chromium.org> Reviewed-by:
Daniel Nicoara <dnicoara@chromium.org> Commit-Queue: Dongseong Hwang <dongseong.hwang@intel.com> Cr-Commit-Position: refs/heads/master@{#480969}
-
japhet authored
Prior to this change, DidStartLoading/DidStopLoading is fired for same document navigations based on a heuristic similar to (but not exactly the same as) the heuristic that changes the Frame loading bit. There's no reason to have multiple different definitions, and this should prevent a situation in which we have interleaved start/stop notifications (or 2 starts but only 1 stop). BUG= Review-Url: https://codereview.chromium.org/2943523002 Cr-Commit-Position: refs/heads/master@{#480968}
-
Mike Bjorge authored
These tests don't have a clear culprit. Disable them to green up the test signal while they are investigated. BUG=internal b/62246873 Change-Id: I4f3f3919fc9a6ba28ab573b289e220aad2b80ced Reviewed-on: https://chromium-review.googlesource.com/535933Reviewed-by:
Stephen Lanham <slan@chromium.org> Commit-Queue: Mike Bjorge <mbjorge@chromium.org> Cr-Commit-Position: refs/heads/master@{#480967}
-
Charlie Andrews authored
These stories are failing on Android TBR=yukishiino@chromium.org,jbroman@chromium.org,haraken@chromium.org Bug: 735113 Change-Id: I343e720f288e7a8b46d22a0c99f3b01768be6d45 Reviewed-on: https://chromium-review.googlesource.com/541579Reviewed-by:
Charlie Andrews <charliea@chromium.org> Reviewed-by:
Jeremy Roman <jbroman@chromium.org> Commit-Queue: Charlie Andrews <charliea@chromium.org> Cr-Commit-Position: refs/heads/master@{#480966}
-
tdanderson authored
The behavior of hiding the close buttons on inactive tabs when in stacked tab mode has been on by default for over two years. Remove the flag which disables this behavior. BUG=525058 Review-Url: https://codereview.chromium.org/2940143002 Cr-Commit-Position: refs/heads/master@{#480965}
-
v8-autoroll authored
Summary of changes available at: https://chromium.googlesource.com/v8/v8/+log/a8a39548..88178697 Please follow these instructions for assigning/CC'ing issues: https://github.com/v8/v8/wiki/Triaging%20issues Please close rolling in case of a roll revert: https://v8-roll.appspot.com/ This only works with a Google account. CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel TBR=hablich@chromium.org,machenbach@chromium.org,kozyatinskiy@chromium.org,vogelheim@chromium.org Review-Url: https://codereview.chromium.org/2947943002 Cr-Commit-Position: refs/heads/master@{#480964}
-
skau authored
Part of the larger Chromium migration away from BrowserThreads. BUG=734279, 667892 Review-Url: https://codereview.chromium.org/2939373003 Cr-Commit-Position: refs/heads/master@{#480963}
-
robertshield authored
BUG=710575 Review-Url: https://codereview.chromium.org/2939403002 Cr-Commit-Position: refs/heads/master@{#480962}
-
sohan.jyoti authored
This adds interface to enable eviction of images from image decode cache in cc. This CL sets up the interface and eviction logic in gpu image decode cache. A follow up would handle the sw cache eviction. BUG=730784 CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel Review-Url: https://codereview.chromium.org/2945813002 Cr-Commit-Position: refs/heads/master@{#480961}
-
skym authored
BUG= Review-Url: https://codereview.chromium.org/2948623003 Cr-Commit-Position: refs/heads/master@{#480960}
-
Jeremy Roman authored
Now that core/imagebitmap/ exists, it's surprising for its namesake to be in core/frame/ instead. This CL is pure code movement. TBR=haraken@chromium.org Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel Change-Id: Ibbd256b6e40c85fedb47ed644595c2ec202156a4 Reviewed-on: https://chromium-review.googlesource.com/541019 Commit-Queue: Jeremy Roman <jbroman@chromium.org> Reviewed-by:
Xida Chen <xidachen@chromium.org> Cr-Commit-Position: refs/heads/master@{#480959}
-
bsep authored
Follow-up to crrev.com/2911573002. There was a regression with a later refactor of the ink drop code, and this fixes that. BUG=652510 Review-Url: https://codereview.chromium.org/2939043005 Cr-Commit-Position: refs/heads/master@{#480958}
-
skia-deps-roller@chromium.org authored
https://skia.googlesource.com/skia.git/+log/ffa8484eb061..49b7b6f38fc9 $ git log ffa8484eb..49b7b6f38 --date=short --no-merges --format='%ad %ae %s' 2017-06-20 brianosman Handle too many (or too large) paths in GrDefaultPathRenderer 2017-06-20 csmartdalton Add makeBuffer and caps to GrOnFlushResourceProvider Created with: roll-dep src/third_party/skia Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, see: http://www.chromium.org/developers/tree-sheriffs/sheriff-details-chromium#TOC-Failures-due-to-DEPS-rolls CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel TBR=halcanary@chromium.org Change-Id: I245f9f94d35e7122e19005d4036f38d5d1d58039 Reviewed-on: https://chromium-review.googlesource.com/541618Reviewed-by:
Skia Deps Roller <skia-deps-roller@chromium.org> Commit-Queue: Skia Deps Roller <skia-deps-roller@chromium.org> Cr-Commit-Position: refs/heads/master@{#480957}
-
Gregory Chatzinoff authored
This reverts commit ce6be2e5. Reason for revert: This CL along with https://chromium-review.googlesource.com/c/536915/ broke a variety of external url tests on ipad 32-bit configs. Original change's description: > Add the header section to ContentSuggestions > > ContentSuggestions is supposed to replace the current NTP and display the logo > and the fake omnibox. > This CL adds the section which will contain the header to the content suggestions. > > Bug: 700375 > Change-Id: I4b9eac70b0464b3e289daf036323398b7704ba9f > Reviewed-on: https://chromium-review.googlesource.com/538693 > Commit-Queue: Gauthier Ambard <gambard@chromium.org> > Reviewed-by: Louis Romero <lpromero@chromium.org> > Cr-Commit-Position: refs/heads/master@{#480763} TBR=lpromero@chromium.org,gambard@chromium.org Change-Id: I4b6d25b4852428d73f077168cba57d302dd5ca8a No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 700375 Reviewed-on: https://chromium-review.googlesource.com/541760Reviewed-by:
Gregory Chatzinoff <gchatz@chromium.org> Commit-Queue: Gregory Chatzinoff <gchatz@chromium.org> Cr-Commit-Position: refs/heads/master@{#480956}
-
pdr authored
Revert of mac: Roll hermetic toolchain to Xcode 8.3.2. (patchset #5 id:80001 of https://codereview.chromium.org/2941293003/ ) Reason for revert: Caused build failures: https://build.chromium.org/p/chromium.mac/builders/Mac10.10%20Tests/builds/19709 Original issue's description: > mac: Roll hermetic toolchain to Xcode 8.3.2. > > Xcode 8.3.2 requires macOS 10.12+. This version of Xcode 8.3.2 has both the > 10.10 and 10.12 SDKs, and builds will continue to use the 10.10 SDK. > > BUG=624049 > > Review-Url: https://codereview.chromium.org/2941293003 > Cr-Original-Commit-Position: refs/heads/master@{#480685} > Committed: https://chromium.googlesource.com/chromium/src/+/abd9ba0ebfca0ce7a37c14593d55ebee56c4a55c > Review-Url: https://codereview.chromium.org/2941293003 > Cr-Commit-Position: refs/heads/master@{#480918} > Committed: https://chromium.googlesource.com/chromium/src/+/7f8f750fffcee0e256c228655e9d331f2dcb6f58 TBR=dpranke@chromium.org,erikchen@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=624049 Review-Url: https://codereview.chromium.org/2946133002 Cr-Commit-Position: refs/heads/master@{#480955}
-
dbeam authored
R=rdevlin.cronin@chromium.org BUG=567770 CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation Review-Url: https://codereview.chromium.org/2948443003 Cr-Commit-Position: refs/heads/master@{#480954}
-
thakis authored
Revert of clang/win: Temporarily slow down renderer startup by 0.1s (patchset #1 id:1 of https://codereview.chromium.org/2944033004/ ) Reason for revert: Dev channel was cut. Original issue's description: > clang/win: Temporarily slow down renderer startup by 0.1s > > We're trying to understand why a certain metric is a bit higher with clang > than with MSVC. We think this might be due to slower renderer startup, but > we're not sure. Slow down renderer startup so we can measure if this is the > reason. > > BUG=728324 > > Review-Url: https://codereview.chromium.org/2944033004 > Cr-Commit-Position: refs/heads/master@{#480707} > Committed: https://chromium.googlesource.com/chromium/src/+/51a2f1e6d3a9edc207bbc096a827153b1a23d316 TBR=avi@chromium.org,kinuko@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=728324 Review-Url: https://codereview.chromium.org/2949913002 Cr-Commit-Position: refs/heads/master@{#480953}
-
Mathieu Perreault authored
Bug: 733526 Test: browser_tests Change-Id: Ia098210f38039221c1b4fcc7ee25c83f93cfb55c Reviewed-on: https://chromium-review.googlesource.com/541679 Commit-Queue: Mathieu Perreault <mathp@chromium.org> Commit-Queue: Anthony Vallee-Dubois <anthonyvd@chromium.org> Reviewed-by:
Anthony Vallee-Dubois <anthonyvd@chromium.org> Cr-Commit-Position: refs/heads/master@{#480952}
-
wzang authored
crbug.com/733024 is actually a CSS style issue. This CL also fixes other obvious style issues for right-to-left languages. We may need to further polish the UI for rtl languages and those changes will be included in a specific polish CL. BUG=733024 Review-Url: https://codereview.chromium.org/2947933002 Cr-Commit-Position: refs/heads/master@{#480951}
-
rajendrant authored
Removes DataUse as a friend of DataUseAscriber. Improves ChromeDataUseAscriber by making repeated code to a private function. BUG=733417 Review-Url: https://codereview.chromium.org/2950603003 Cr-Commit-Position: refs/heads/master@{#480950}
-
asvitkine authored
This keeps the property of compiling the code on all platforms, while removing the need to have a ton of individual per-test ifdefs. For tests that are later disabled for other reasons, this can result in DISABLED_ prefix appearing two times, but that doesn't seem too problematic and the code cleanup benefits outweigh that. BUG=none Review-Url: https://codereview.chromium.org/2947023002 Cr-Commit-Position: refs/heads/master@{#480949}
-
eae authored
Break the dependency on LayoutObject for NinePieceImage painting and for border painting by updating NinePieceImagePainter to instead take a Node and a ImageResourceObserver reference. Also moves border painting to the BoxPainterBase class as border painting can now be shared with LayoutNG. R=pdr@chromium.org BUG=714962 CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2 Review-Url: https://codereview.chromium.org/2942123002 Cr-Commit-Position: refs/heads/master@{#480948}
-