Further refactoring, move ImageInfo into Disassembler/DisassemblerWin32X86.

courgette/ensemble.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // The main idea in Courgette is to do patching *under a tranformation*.  The
 // input is transformed into a new representation, patching occurs in the new
 // repesentation, and then the tranform is reversed to get the patched data.
 //
 // The idea is applied to pieces (or 'Elements') of the whole (or 'Ensemble').
 // Each of the elements has to go through the same set of steps in lock-step,
@@ skipping 12 matching lines @@
 #include "base/basictypes.h"
 
 #include "courgette/courgette.h"
 #include "courgette/region.h"
 #include "courgette/streams.h"
 
 namespace courgette {
 
 // Forward declarations:
 class Ensemble;
-class PEInfo;
 
 // An Element is a region of an Ensemble with an identifyable kind.
 //
 class Element {
  public:
   Element(ExecutableType kind,
           Ensemble* ensemble,
-          const Region& region,
-          PEInfo*info);
+          const Region& region);
 
   virtual ~Element();
 
   ExecutableType kind() const { return kind_; }
   const Region& region() const { return region_; }
 
   // The name is used only for debugging and logging.
   virtual std::string Name() const;
 
   // Returns the byte position of this Element relative to the start of
   // containing Ensemble.
   size_t offset_in_ensemble() const;
 
-  // The ImageInfo for this executable
-  virtual PEInfo* GetImageInfo() const { return info_; }
-
  private:
   ExecutableType kind_;
   Ensemble* ensemble_;
   Region region_;
-  PEInfo *info_;
 
   DISALLOW_COPY_AND_ASSIGN(Element);
 };
 
 
 class Ensemble {
  public:
   Ensemble(const Region& region, const char* name)
       : region_(region), name_(name) {}
   ~Ensemble();
@@ skipping 177 matching lines @@
                         SinkStream* reformed_element);
 
  protected:
   Element* old_element_;
   Element* new_element_;
   TransformationPatcher* patcher_;
 };
 
 }  // namespace
 #endif  // COURGETTE_ENSEMBLE_H_