From 984f320a83ce6827b203c6264d9220279ced85c9 Mon Sep 17 00:00:00 2001
From: Bogdan Tara <btara@mozilla.com>
Date: Fri, 22 Jun 2018 01:31:07 +0300
Subject: [PATCH] Backed out changeset 0ef199e4d83d (bug 1467363) for failures
 on BlockingResourceBase.cpp CLOSED TREE

---
 widget/windows/WinCompositorWidget.cpp | 9 ---------
 widget/windows/WinCompositorWidget.h   | 2 --
 2 files changed, 11 deletions(-)

diff --git a/widget/windows/WinCompositorWidget.cpp b/widget/windows/WinCompositorWidget.cpp
index c239a14b0a5a..8dfcee14288f 100644
--- a/widget/windows/WinCompositorWidget.cpp
+++ b/widget/windows/WinCompositorWidget.cpp
@@ -19,7 +19,6 @@ namespace mozilla {
 namespace widget {
 
 using namespace mozilla::gfx;
-using namespace mozilla;
 
 WinCompositorWidget::WinCompositorWidget(const WinCompositorWidgetInitData& aInitData,
                                          const layers::CompositorOptions& aOptions)
@@ -27,7 +26,6 @@ WinCompositorWidget::WinCompositorWidget(const WinCompositorWidgetInitData& aIni
  , mWidgetKey(aInitData.widgetKey()),
    mWnd(reinterpret_cast<HWND>(aInitData.hWnd())),
    mCompositorWnd(nullptr),
-   mTransparentSurfaceLock("mTransparentSurfaceLock"),
    mTransparencyMode(aInitData.transparencyMode()),
    mMemoryDC(nullptr),
    mCompositeDC(nullptr),
@@ -50,7 +48,6 @@ WinCompositorWidget::~WinCompositorWidget()
 void
 WinCompositorWidget::OnDestroyWindow()
 {
-  MutexAutoLock lock(mTransparentSurfaceLock);
   mTransparentSurface = nullptr;
   mMemoryDC = nullptr;
 }
@@ -87,8 +84,6 @@ WinCompositorWidget::GetClientSize()
 already_AddRefed<gfx::DrawTarget>
 WinCompositorWidget::StartRemoteDrawing()
 {
-  MutexAutoLock lock(mTransparentSurfaceLock);
-
   MOZ_ASSERT(!mCompositeDC);
 
   RefPtr<gfxASurface> surf;
@@ -249,7 +244,6 @@ WinCompositorWidget::LeavePresentLock()
 RefPtr<gfxASurface>
 WinCompositorWidget::EnsureTransparentSurface()
 {
-  mTransparentSurfaceLock.AssertCurrentThreadOwns();
   MOZ_ASSERT(mTransparencyMode == eTransparencyTransparent);
 
   IntSize size = GetClientSize().ToUnknownSize();
@@ -266,7 +260,6 @@ WinCompositorWidget::EnsureTransparentSurface()
 void
 WinCompositorWidget::CreateTransparentSurface(const gfx::IntSize& aSize)
 {
-  mTransparentSurfaceLock.AssertCurrentThreadOwns();
   MOZ_ASSERT(!mTransparentSurface && !mMemoryDC);
   RefPtr<gfxWindowsSurface> surface = new gfxWindowsSurface(aSize, SurfaceFormat::A8R8G8B8_UINT32);
   mTransparentSurface = surface;
@@ -276,7 +269,6 @@ WinCompositorWidget::CreateTransparentSurface(const gfx::IntSize& aSize)
 void
 WinCompositorWidget::UpdateTransparency(nsTransparencyMode aMode)
 {
-  MutexAutoLock lock(mTransparentSurfaceLock);
   if (mTransparencyMode == aMode) {
     return;
   }
@@ -293,7 +285,6 @@ WinCompositorWidget::UpdateTransparency(nsTransparencyMode aMode)
 void
 WinCompositorWidget::ClearTransparentWindow()
 {
-  MutexAutoLock lock(mTransparentSurfaceLock);
   if (!mTransparentSurface) {
     return;
   }
diff --git a/widget/windows/WinCompositorWidget.h b/widget/windows/WinCompositorWidget.h
index 01414fc56563..ab4377a24258 100644
--- a/widget/windows/WinCompositorWidget.h
+++ b/widget/windows/WinCompositorWidget.h
@@ -10,7 +10,6 @@
 #include "gfxASurface.h"
 #include "mozilla/gfx/CriticalSection.h"
 #include "mozilla/gfx/Point.h"
-#include "mozilla/Mutex.h"
 #include "nsIWidget.h"
 
 class nsWindow;
@@ -125,7 +124,6 @@ private:
   gfx::CriticalSection mPresentLock;
 
   // Transparency handling.
-  mozilla::Mutex mTransparentSurfaceLock;
   nsTransparencyMode mTransparencyMode;
   RefPtr<gfxASurface> mTransparentSurface;
   HDC mMemoryDC;