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

Issue 915153002: Revert of Fix Chromium build (Closed)

Created:
5 years, 10 months ago by robertphillips
Modified:
5 years, 10 months ago
Reviewers:
jvanverth1
CC:
reviews_skia.org
Base URL:
https://skia.googlesource.com/skia.git@master
Target Ref:
refs/heads/master
Project:
skia
Visibility:
Public.

Description

Revert of Fix Chromium build (patchset #2 id:20001 of https://codereview.chromium.org/916763003/) Reason for revert: Chrome Original issue's description: > Fix Chromium build > > TBR=jvanverth@google.com > > Committed: https://skia.googlesource.com/skia/+/f5e89c8f685ac8a5c4d117e087b4111d613106db TBR=jvanverth@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+5 lines, -5 lines) Patch
M debugger/QT/SkDebuggerGUI.cpp View 1 chunk +3 lines, -0 lines 0 comments Download
M src/utils/debugger/SkDrawCommand.h View 1 chunk +0 lines, -2 lines 0 comments Download
M tests/MatrixClipCollapseTest.cpp View 2 chunks +1 line, -3 lines 0 comments Download
M tools/filtermain.cpp View 1 chunk +1 line, -0 lines 0 comments Download

Messages

Total messages: 4 (1 generated)
robertphillips
Created Revert of Fix Chromium build
5 years, 10 months ago (2015-02-11 21:05:40 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/915153002/1
5 years, 10 months ago (2015-02-11 21:06:06 UTC) #2
commit-bot: I haz the power
5 years, 10 months ago (2015-02-11 21:06:09 UTC) #4
Failed to apply patch for src/utils/debugger/SkDrawCommand.h:
While running git apply --index -3 -p1;
  error: patch failed: src/utils/debugger/SkDrawCommand.h:110
  Falling back to three-way merge...
  Applied patch to 'src/utils/debugger/SkDrawCommand.h' with conflicts.
  U src/utils/debugger/SkDrawCommand.h

Patch:       src/utils/debugger/SkDrawCommand.h
Index: src/utils/debugger/SkDrawCommand.h
diff --git a/src/utils/debugger/SkDrawCommand.h
b/src/utils/debugger/SkDrawCommand.h
index
45b5ee1572c14e31f0c892b1a0e3b1ba7f705f3a..bcc97ca7916bf1f2d15d55e2a9509ef58fa747a3
100644
--- a/src/utils/debugger/SkDrawCommand.h
+++ b/src/utils/debugger/SkDrawCommand.h
@@ -110,8 +110,6 @@
     bool   fVisible;
 };
 
-typedef SkDrawCommand::OpType DrawType;
-
 class SkRestoreCommand : public SkDrawCommand {
 public:
     SkRestoreCommand();

Powered by Google App Engine
This is Rietveld 408576698