Backed out changeset 8cd211d1292e (bug 1399178) for unexpected passes on quantumrenderer, e.g. in reftest layout/reftests/counters/counter-suffix-ref.html. r=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Wed, 13 Sep 2017 23:06:13 +0200
changeset 430315 79eb1b3a29284410ffe3f2c150a2f78cdaf6ac89
parent 430314 df83df29fd504876e8974a9013b8b6d541d64f55
child 430316 93d73e65449839f2c38c6207b26f3d9209ea9487
push id7761
push userjlund@mozilla.com
push dateFri, 15 Sep 2017 00:19:52 +0000
treeherdermozilla-beta@c38455951db4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1399178
milestone57.0a1
backs out8cd211d1292e602c0b4c439d39a70aa082ed0c76
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 8cd211d1292e (bug 1399178) for unexpected passes on quantumrenderer, e.g. in reftest layout/reftests/counters/counter-suffix-ref.html. r=backout
gfx/2d/DrawCommand.h
gfx/2d/DrawTargetCapture.cpp
gfx/2d/DrawTargetCapture.h
--- a/gfx/2d/DrawCommand.h
+++ b/gfx/2d/DrawCommand.h
@@ -32,17 +32,16 @@ enum class CommandType : int8_t {
   MASK,
   MASKSURFACE,
   PUSHCLIP,
   PUSHCLIPRECT,
   PUSHLAYER,
   POPCLIP,
   POPLAYER,
   SETTRANSFORM,
-  SETPERMITSUBPIXELAA,
   FLUSH
 };
 
 class DrawingCommand
 {
 public:
   virtual ~DrawingCommand() {}
 
@@ -671,35 +670,16 @@ public:
       aDT->SetTransform(mTransform);
     }
   }
 
 private:
   Matrix mTransform;
 };
 
-class SetPermitSubpixelAACommand : public DrawingCommand
-{
-  friend class DrawTargetCaptureImpl;
-public:
-  explicit SetPermitSubpixelAACommand(bool aPermitSubpixelAA)
-    : DrawingCommand(CommandType::SETPERMITSUBPIXELAA)
-    , mPermitSubpixelAA(aPermitSubpixelAA)
-  {
-  }
-
-  virtual void ExecuteOnDT(DrawTarget* aDT, const Matrix* aMatrix) const
-  {
-    aDT->SetPermitSubpixelAA(mPermitSubpixelAA);
-  }
-
-private:
-  bool mPermitSubpixelAA;
-};
-
 class FlushCommand : public DrawingCommand
 {
 public:
   explicit FlushCommand()
     : DrawingCommand(CommandType::FLUSH)
   {
   }
 
--- a/gfx/2d/DrawTargetCapture.cpp
+++ b/gfx/2d/DrawTargetCapture.cpp
@@ -73,27 +73,16 @@ DrawTargetCaptureImpl::Snapshot()
 
 void
 DrawTargetCaptureImpl::DetachAllSnapshots()
 {}
 
 #define AppendCommand(arg) new (AppendToCommandList<arg>()) arg
 
 void
-DrawTargetCaptureImpl::SetPermitSubpixelAA(bool aPermitSubpixelAA)
-{
-  AppendCommand(SetPermitSubpixelAACommand)(aPermitSubpixelAA);
-
-  // Have to update mPermitSubpixelAA for this DT
-  // because some code paths query the current setting
-  // to determine subpixel AA eligibility.
-  DrawTarget::SetPermitSubpixelAA(aPermitSubpixelAA);
-}
-
-void
 DrawTargetCaptureImpl::DrawSurface(SourceSurface *aSurface,
                                    const Rect &aDest,
                                    const Rect &aSource,
                                    const DrawSurfaceOptions &aSurfOptions,
                                    const DrawOptions &aOptions)
 {
   aSurface->GuaranteePersistance();
   AppendCommand(DrawSurfaceCommand)(aSurface, aDest, aSource, aSurfOptions, aOptions);
--- a/gfx/2d/DrawTargetCapture.h
+++ b/gfx/2d/DrawTargetCapture.h
@@ -22,17 +22,16 @@ public:
   DrawTargetCaptureImpl(BackendType aBackend, const IntSize& aSize, SurfaceFormat aFormat);
 
   bool Init(const IntSize& aSize, DrawTarget* aRefDT);
 
   virtual BackendType GetBackendType() const override { return mRefDT->GetBackendType(); }
   virtual DrawTargetType GetType() const override { return mRefDT->GetType(); }
   virtual bool IsCaptureDT() const override { return true; }
   virtual already_AddRefed<SourceSurface> Snapshot() override;
-  virtual void SetPermitSubpixelAA(bool aPermitSubpixelAA) override;
   virtual void DetachAllSnapshots() override;
   virtual IntSize GetSize() override { return mSize; }
   virtual void Flush() override {}
   virtual void DrawSurface(SourceSurface *aSurface,
                            const Rect &aDest,
                            const Rect &aSource,
                            const DrawSurfaceOptions &aSurfOptions,
                            const DrawOptions &aOptions) override;