Revert of Fix Chromium build (again)

src/utils/debugger/SkDrawCommand.h

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SKDRAWCOMMAND_H_
 #define SKDRAWCOMMAND_H_
@@ skipping 92 matching lines @@
 
 protected:
     SkTDArray<SkString*> fInfo;
 
 private:
     OpType fOpType;
     size_t fOffset;
     bool   fVisible;
 };
 
-// TODO: switch Chromium over to not using these
 typedef SkDrawCommand::OpType DrawType;
 
-#define SAVE SkDrawCommand::kSave_OpType
-#define SCALE SkDrawCommand::kSetMatrix_OpType
-#define TRANSLATE SkDrawCommand::kSetMatrix_OpType
-#define DRAW_RECT SkDrawCommand::kDrawRect_OpType
-#define RESTORE SkDrawCommand::kRestore_OpType
-#define CLIP_RECT SkDrawCommand::kClipRect_OpType
-
 class SkRestoreCommand : public SkDrawCommand {
 public:
     SkRestoreCommand();
     void execute(SkCanvas* canvas) const SK_OVERRIDE;
     Action action() const SK_OVERRIDE { return kPopLayer_Action; }
 
 private:
     typedef SkDrawCommand INHERITED;
 };
 
@@ skipping 463 matching lines @@
     void setUserMatrix(const SkMatrix&) SK_OVERRIDE;
     void execute(SkCanvas* canvas) const SK_OVERRIDE;
 private:
     SkMatrix fUserMatrix;
     SkMatrix fMatrix;
 
     typedef SkDrawCommand INHERITED;
 };
 
 #endif