Commit fa2d5b1c authored by Cosmin Sabou's avatar Cosmin Sabou
Browse files

Backed out 3 changesets (bug 1538969) for wpt reftests failures on... 

Backed out 3 changesets (bug 1538969) for wpt reftests failures on transform3d-backface-visibility-001.

Backed out changeset c8e85a802c77 (bug 1538969)
Backed out changeset 911386e724bc (bug 1538969)
Backed out changeset 2332a2fb02fa (bug 1538969)

--HG--
extra : amend_source : 6f1ed1f9f2e978ab6c52a03cde73b225ff09448b
parent a50a0700

dom/html/HTMLVideoElement.h

+0 −2
Original line number Diff line number Diff line
@@ -105,8 +105,6 @@ class HTMLVideoElement final : public HTMLMediaElement { 
    return mMediaInfo.mVideo.mRotation;

  }



  bool HasAlpha() const { return mMediaInfo.mVideo.HasAlpha(); }



  void GetPoster(nsAString& aValue) {

    GetURIAttr(nsGkAtoms::poster, nullptr, aValue);

  }

dom/media/platforms/android/RemoteDataDecoder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ class RemoteVideoDecoder : public RemoteDataDecoder { 
    if (ok && (size > 0 || presentationTimeUs >= 0)) {

      RefPtr<layers::Image> img = new SurfaceTextureImage(

          mSurfaceHandle, inputInfo.mImageSize, false /* NOT continuous */,

          gl::OriginPos::BottomLeft, mConfig.HasAlpha());

          gl::OriginPos::BottomLeft);



      RefPtr<VideoData> v = VideoData::CreateFromImage(

          inputInfo.mDisplaySize, offset,

gfx/layers/GLImages.cpp

+2 −4
Original line number Diff line number Diff line
@@ -75,14 +75,12 @@ already_AddRefed<gfx::SourceSurface> GLImage::GetAsSourceSurface() { 
SurfaceTextureImage::SurfaceTextureImage(AndroidSurfaceTextureHandle aHandle,

                                         const gfx::IntSize& aSize,

                                         bool aContinuous,

                                         gl::OriginPos aOriginPos,

                                         bool aHasAlpha /* = true */)

                                         gl::OriginPos aOriginPos)

    : GLImage(ImageFormat::SURFACE_TEXTURE),

      mHandle(aHandle),

      mSize(aSize),

      mContinuous(aContinuous),

      mOriginPos(aOriginPos),

      mHasAlpha(aHasAlpha) {

      mOriginPos(aOriginPos) {

  MOZ_ASSERT(mHandle);

}

#endif

gfx/layers/GLImages.h

+1 −3
Original line number Diff line number Diff line
@@ -33,13 +33,12 @@ class SurfaceTextureImage : public GLImage { 
 public:

  SurfaceTextureImage(AndroidSurfaceTextureHandle aHandle,

                      const gfx::IntSize& aSize, bool aContinuous,

                      gl::OriginPos aOriginPos, bool aHasAlpha = true);

                      gl::OriginPos aOriginPos);



  gfx::IntSize GetSize() const override { return mSize; }

  AndroidSurfaceTextureHandle GetHandle() const { return mHandle; }

  bool GetContinuous() const { return mContinuous; }

  gl::OriginPos GetOriginPos() const { return mOriginPos; }

  bool GetHasAlpha() const { return mHasAlpha; }



  already_AddRefed<gfx::SourceSurface> GetAsSourceSurface() override {

    // We can implement this, but currently don't want to because it will cause
@@ -55,7 +54,6 @@ class SurfaceTextureImage : public GLImage { 
  gfx::IntSize mSize;

  bool mContinuous;

  gl::OriginPos mOriginPos;

  const bool mHasAlpha;

};



#endif  // MOZ_WIDGET_ANDROID

gfx/layers/client/ImageClient.cpp

+2 −2
Original line number Diff line number Diff line
@@ -123,8 +123,8 @@ already_AddRefed<TextureClient> ImageClient::CreateTextureClientForImage( 
    SurfaceTextureImage* typedImage = aImage->AsSurfaceTextureImage();

    texture = AndroidSurfaceTextureData::CreateTextureClient(

        typedImage->GetHandle(), size, typedImage->GetContinuous(),

        typedImage->GetOriginPos(), typedImage->GetHasAlpha(),

        aForwarder->GetTextureForwarder(), TextureFlags::DEFAULT);

        typedImage->GetOriginPos(), aForwarder->GetTextureForwarder(),

        TextureFlags::DEFAULT);

#endif

  } else {

    RefPtr<gfx::SourceSurface> surface = aImage->GetAsSourceSurface();