Chromium Code Reviews
|
|
Chromium Code Reviews
Issue
2482643002:
Revert of Roll src/third_party/skia/ 544da7a7c..12ae597ef (5 commits). (Closed)
DescriptionRevert of Roll src/third_party/skia/ 544da7a7c..12ae597ef (5 commits). (patchset #1 id:1 of https://codereview.chromium.org/2470913008/ )
Reason for revert:
2016-11-04 robertphillips Further centralize computation of GrSurface VRAM consumption
Causing offscreen canvas test failure
https://build.chromium.org/p/chromium.webkit/builders/WebKit%20Win7%20%28dbg%29/builds/7991
Original issue's description:
> Roll src/third_party/skia/ 544da7a7c..12ae597ef (5 commits).
>
> https://chromium.googlesource.com/skia.git/+log/544da7a7c399..12ae597ef54c
>
> $ git log 544da7a7c..12ae597ef --date=short --no-merges --format='%ad %ae %s'
> 2016-11-04 herb Use alignas to force alignment.
> 2016-11-04 bsalomon Add documentation for using testing using the command buffer GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2479833003 NOTRY=true DOCS_PREVIEW= https://skia.org/?cl=2479833003
> 2016-11-04 stephana Re-enable iOS testing
> 2016-11-03 bungeman Clarify onCreateScalerContext failure modes.
> 2016-11-04 robertphillips Further centralize computation of GrSurface VRAM consumption
>
> 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_precise_blink_rel
> TBR=benjaminwagner@google.com
>
> Committed: https://crrev.com/1307275bad7e590b4a6c2a800de82289a3694db3
> Cr-Commit-Position: refs/heads/master@{#429925}
TBR=benjaminwagner@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
BUG=662630
Committed: https://crrev.com/0a84b24525fab8776503164e6b55a01d4070a64e
Cr-Commit-Position: refs/heads/master@{#430163}
Patch Set 1 #Patch Set 2 : manual #Patch Set 3 : rebase #Messages
Total messages: 16 (8 generated)
The CQ bit was checked by mathp@chromium.org
Created Revert of Roll src/third_party/skia/ 544da7a7c..12ae597ef (5 commits).
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Failed to apply patch for DEPS: While running git apply --index -3 -p1; error: patch failed: DEPS:39 error: repository lacks the necessary blob to fall back on 3-way merge. error: DEPS: patch does not apply Patch: DEPS Index: DEPS diff --git a/DEPS b/DEPS index 7dd0c63a996a5d1c3002330a3856491e58ff2718..bfb66f9cc4292749c649f8ab9946cfe205a2ed68 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': '12ae597ef54c35e9c447f5f52ecbc153503e8b73', + 'skia_revision': '544da7a7c399ab9775d6dbb441a5a695569f9939', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling V8 # and whatever else without interference from each other.
The CQ bit was checked by mathp@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
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
1aecd305a8fabbda27b537d47bbd36aa603889fc..c3a121a08d0e5433c0d1636fc1dcdde82bfc6951
100644
--- a/DEPS
+++ b/DEPS
@@ -39,7 +39,7 @@ vars = {
# 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': 'e1d6ff172e219d3be61949b0e44091f4c85de2ad',
+ 'skia_revision': '544da7a7c399ab9775d6dbb441a5a695569f9939',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling V8
# and whatever else without interference from each other.
The CQ bit was checked by mathp@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
Description was changed from ========== Revert of Roll src/third_party/skia/ 544da7a7c..12ae597ef (5 commits). (patchset #1 id:1 of https://codereview.chromium.org/2470913008/ ) Reason for revert: 2016-11-04 robertphillips Further centralize computation of GrSurface VRAM consumption Causing offscreen canvas test failure https://build.chromium.org/p/chromium.webkit/builders/WebKit%20Win7%20%28dbg%... Original issue's description: > Roll src/third_party/skia/ 544da7a7c..12ae597ef (5 commits). > > https://chromium.googlesource.com/skia.git/+log/544da7a7c399..12ae597ef54c > > $ git log 544da7a7c..12ae597ef --date=short --no-merges --format='%ad %ae %s' > 2016-11-04 herb Use alignas to force alignment. > 2016-11-04 bsalomon Add documentation for using testing using the command buffer GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2479833003 NOTRY=true DOCS_PREVIEW= https://skia.org/?cl=2479833003 > 2016-11-04 stephana Re-enable iOS testing > 2016-11-03 bungeman Clarify onCreateScalerContext failure modes. > 2016-11-04 robertphillips Further centralize computation of GrSurface VRAM consumption > > 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... > > CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_precise_blink_rel > TBR=benjaminwagner@google.com > > Committed: https://crrev.com/1307275bad7e590b4a6c2a800de82289a3694db3 > Cr-Commit-Position: refs/heads/master@{#429925} TBR=benjaminwagner@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 ========== to ========== Revert of Roll src/third_party/skia/ 544da7a7c..12ae597ef (5 commits). (patchset #1 id:1 of https://codereview.chromium.org/2470913008/ ) Reason for revert: 2016-11-04 robertphillips Further centralize computation of GrSurface VRAM consumption Causing offscreen canvas test failure https://build.chromium.org/p/chromium.webkit/builders/WebKit%20Win7%20%28dbg%... Original issue's description: > Roll src/third_party/skia/ 544da7a7c..12ae597ef (5 commits). > > https://chromium.googlesource.com/skia.git/+log/544da7a7c399..12ae597ef54c > > $ git log 544da7a7c..12ae597ef --date=short --no-merges --format='%ad %ae %s' > 2016-11-04 herb Use alignas to force alignment. > 2016-11-04 bsalomon Add documentation for using testing using the command buffer GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2479833003 NOTRY=true DOCS_PREVIEW= https://skia.org/?cl=2479833003 > 2016-11-04 stephana Re-enable iOS testing > 2016-11-03 bungeman Clarify onCreateScalerContext failure modes. > 2016-11-04 robertphillips Further centralize computation of GrSurface VRAM consumption > > 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... > > CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_precise_blink_rel > TBR=benjaminwagner@google.com > > Committed: https://crrev.com/1307275bad7e590b4a6c2a800de82289a3694db3 > Cr-Commit-Position: refs/heads/master@{#429925} TBR=benjaminwagner@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 BUG=662630 ==========
Message was sent while issue was closed.
Description was changed from ========== Revert of Roll src/third_party/skia/ 544da7a7c..12ae597ef (5 commits). (patchset #1 id:1 of https://codereview.chromium.org/2470913008/ ) Reason for revert: 2016-11-04 robertphillips Further centralize computation of GrSurface VRAM consumption Causing offscreen canvas test failure https://build.chromium.org/p/chromium.webkit/builders/WebKit%20Win7%20%28dbg%... Original issue's description: > Roll src/third_party/skia/ 544da7a7c..12ae597ef (5 commits). > > https://chromium.googlesource.com/skia.git/+log/544da7a7c399..12ae597ef54c > > $ git log 544da7a7c..12ae597ef --date=short --no-merges --format='%ad %ae %s' > 2016-11-04 herb Use alignas to force alignment. > 2016-11-04 bsalomon Add documentation for using testing using the command buffer GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2479833003 NOTRY=true DOCS_PREVIEW= https://skia.org/?cl=2479833003 > 2016-11-04 stephana Re-enable iOS testing > 2016-11-03 bungeman Clarify onCreateScalerContext failure modes. > 2016-11-04 robertphillips Further centralize computation of GrSurface VRAM consumption > > 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... > > CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_precise_blink_rel > TBR=benjaminwagner@google.com > > Committed: https://crrev.com/1307275bad7e590b4a6c2a800de82289a3694db3 > Cr-Commit-Position: refs/heads/master@{#429925} TBR=benjaminwagner@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 BUG=662630 ========== to ========== Revert of Roll src/third_party/skia/ 544da7a7c..12ae597ef (5 commits). (patchset #1 id:1 of https://codereview.chromium.org/2470913008/ ) Reason for revert: 2016-11-04 robertphillips Further centralize computation of GrSurface VRAM consumption Causing offscreen canvas test failure https://build.chromium.org/p/chromium.webkit/builders/WebKit%20Win7%20%28dbg%... Original issue's description: > Roll src/third_party/skia/ 544da7a7c..12ae597ef (5 commits). > > https://chromium.googlesource.com/skia.git/+log/544da7a7c399..12ae597ef54c > > $ git log 544da7a7c..12ae597ef --date=short --no-merges --format='%ad %ae %s' > 2016-11-04 herb Use alignas to force alignment. > 2016-11-04 bsalomon Add documentation for using testing using the command buffer GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2479833003 NOTRY=true DOCS_PREVIEW= https://skia.org/?cl=2479833003 > 2016-11-04 stephana Re-enable iOS testing > 2016-11-03 bungeman Clarify onCreateScalerContext failure modes. > 2016-11-04 robertphillips Further centralize computation of GrSurface VRAM consumption > > 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... > > CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_precise_blink_rel > TBR=benjaminwagner@google.com > > Committed: https://crrev.com/1307275bad7e590b4a6c2a800de82289a3694db3 > Cr-Commit-Position: refs/heads/master@{#429925} TBR=benjaminwagner@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 BUG=662630 ==========
Message was sent while issue was closed.
Committed patchset #3 (id:60001)
Message was sent while issue was closed.
Description was changed from ========== Revert of Roll src/third_party/skia/ 544da7a7c..12ae597ef (5 commits). (patchset #1 id:1 of https://codereview.chromium.org/2470913008/ ) Reason for revert: 2016-11-04 robertphillips Further centralize computation of GrSurface VRAM consumption Causing offscreen canvas test failure https://build.chromium.org/p/chromium.webkit/builders/WebKit%20Win7%20%28dbg%... Original issue's description: > Roll src/third_party/skia/ 544da7a7c..12ae597ef (5 commits). > > https://chromium.googlesource.com/skia.git/+log/544da7a7c399..12ae597ef54c > > $ git log 544da7a7c..12ae597ef --date=short --no-merges --format='%ad %ae %s' > 2016-11-04 herb Use alignas to force alignment. > 2016-11-04 bsalomon Add documentation for using testing using the command buffer GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2479833003 NOTRY=true DOCS_PREVIEW= https://skia.org/?cl=2479833003 > 2016-11-04 stephana Re-enable iOS testing > 2016-11-03 bungeman Clarify onCreateScalerContext failure modes. > 2016-11-04 robertphillips Further centralize computation of GrSurface VRAM consumption > > 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... > > CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_precise_blink_rel > TBR=benjaminwagner@google.com > > Committed: https://crrev.com/1307275bad7e590b4a6c2a800de82289a3694db3 > Cr-Commit-Position: refs/heads/master@{#429925} TBR=benjaminwagner@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 BUG=662630 ========== to ========== Revert of Roll src/third_party/skia/ 544da7a7c..12ae597ef (5 commits). (patchset #1 id:1 of https://codereview.chromium.org/2470913008/ ) Reason for revert: 2016-11-04 robertphillips Further centralize computation of GrSurface VRAM consumption Causing offscreen canvas test failure https://build.chromium.org/p/chromium.webkit/builders/WebKit%20Win7%20%28dbg%... Original issue's description: > Roll src/third_party/skia/ 544da7a7c..12ae597ef (5 commits). > > https://chromium.googlesource.com/skia.git/+log/544da7a7c399..12ae597ef54c > > $ git log 544da7a7c..12ae597ef --date=short --no-merges --format='%ad %ae %s' > 2016-11-04 herb Use alignas to force alignment. > 2016-11-04 bsalomon Add documentation for using testing using the command buffer GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2479833003 NOTRY=true DOCS_PREVIEW= https://skia.org/?cl=2479833003 > 2016-11-04 stephana Re-enable iOS testing > 2016-11-03 bungeman Clarify onCreateScalerContext failure modes. > 2016-11-04 robertphillips Further centralize computation of GrSurface VRAM consumption > > 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... > > CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_precise_blink_rel > TBR=benjaminwagner@google.com > > Committed: https://crrev.com/1307275bad7e590b4a6c2a800de82289a3694db3 > Cr-Commit-Position: refs/heads/master@{#429925} TBR=benjaminwagner@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 BUG=662630 Committed: https://crrev.com/0a84b24525fab8776503164e6b55a01d4070a64e Cr-Commit-Position: refs/heads/master@{#430163} ==========
Message was sent while issue was closed.
Patchset 3 (id:??) landed as https://crrev.com/0a84b24525fab8776503164e6b55a01d4070a64e Cr-Commit-Position: refs/heads/master@{#430163} |
