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

Issue 2122073003: Reland of ll src/third_party/skia/ 1e2a702c1..4be9a30ae (5 commits). (Closed)

Created:
4 years, 5 months ago by sgurun-gerrit only
Modified:
4 years, 5 months ago
CC:
chromium-reviews, rmistry
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Reland of ll src/third_party/skia/ 1e2a702c1..4be9a30ae (5 commits). (patchset #1 id:1 of https://codereview.chromium.org/2122293002/ ) Reason for revert: the revert did not help, reverting the revert. Bug: 626042 Original issue's description: > Revert of Roll src/third_party/skia/ 1e2a702c1..4be9a30ae (5 commits). (patchset #1 id:1 of https://codereview.chromium.org/2125883002/ ) > > Reason for revert: > Reverting speculatively since the android_webview test apk and chrome_public_test_apk started failing. > > I will revert the revert if this is not the reason. > > Original issue's description: > > Roll src/third_party/skia/ 1e2a702c1..4be9a30ae (5 commits). > > > > https://chromium.googlesource.com/skia.git/+log/1e2a702c1959..4be9a30aed39 > > > > $ git log 1e2a702c1..4be9a30ae --date=short --no-merges --format='%ad %ae %s' > > 2016-07-06 bsalomon Increase batching for AA fill rects. > > 2016-07-06 ethannicholas fix for Clang 3.8 warning in SkSL GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2118033002 > > 2016-07-06 benjaminwagner Blacklist fontscalerdistortable on Win8. > > 2016-07-06 bsalomon Enlarge strokerect GM size to reveal hidden content GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2126723002 > > 2016-07-06 fmalita Document SkSurface::MakeRaster's memory initialization > > > > CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel > > TBR=rmistry@google.com > > > > Committed: https://crrev.com/c862d885af12c6d922fda7a1d082cbe7e8500fdc > > Cr-Commit-Position: refs/heads/master@{#403911} > > TBR=rmistry@google.com,skia-deps-roller@chromium.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > > Committed: https://crrev.com/78e5449e0c5b2ba4bea021f078621b207e0b3f66 > Cr-Commit-Position: refs/heads/master@{#403930} TBR=rmistry@google.com,skia-deps-roller@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1 line, -1 line) Patch
M DEPS View 1 chunk +1 line, -1 line 0 comments Download

Messages

Total messages: 7 (3 generated)
sgurun-gerrit only
Created Reland of ll src/third_party/skia/ 1e2a702c1..4be9a30ae (5 commits).
4 years, 5 months ago (2016-07-06 19:47:55 UTC) #2
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2122073003/1
4 years, 5 months ago (2016-07-06 19:48:23 UTC) #3
commit-bot: I haz the power
Failed to apply patch for DEPS: While running git apply --index -3 -p1; error: patch ...
4 years, 5 months ago (2016-07-06 19:49:03 UTC) #5
sgurun-gerrit only
4 years, 5 months ago (2016-07-06 20:18:58 UTC) #6
On 2016/07/06 19:49:03, commit-bot: I haz the power wrote:
> Failed to apply patch for DEPS:
> While running git apply --index -3 -p1;
>   error: patch failed: DEPS:39
>   Falling back to three-way merge...
>   Applied patch to 'DEPS' with conflicts.
>   U DEPS
> 
> Patch:       DEPS
> Index: DEPS
> diff --git a/DEPS b/DEPS
> index
>
df97c9515486f708f264bc3c52f5cd74a8b4ae9a..026675a5f7c137e1539baf40254094a20f1cb1ad
> 100644
> --- a/DEPS
> +++ b/DEPS
> @@ -39,7 +39,7 @@
>    # Three lines of non-changing comments so that
>    # the commit queue can handle CLs rolling Skia
>    # and whatever else without interference from each other.
> -  'skia_revision': '1e2a702c1959d37db734d2ecfaee0e5035b2bfbb',
> +  'skia_revision': '4be9a30aed390bd37681242252fe29d7839bad19',
>    # Three lines of non-changing comments so that
>    # the commit queue can handle CLs rolling V8
>    # and whatever else without interference from each other.

ok autorolled rolled these in   https://codereview.chromium.org/2129673002,
closing.

Powered by Google App Engine
This is Rietveld 408576698