Revert "Revert "Revert "Revert "Remove GrBackendRenderTargetDesc in favor of GrBackendRenderTarget.""""

This reverts commit 6df4d6be0d025211400de6a910e17f2a87219887.

Reason for revert: Google3 fix landed

Original change's description:
> Revert "Revert "Revert "Remove GrBackendRenderTargetDesc in favor of GrBackendRenderTarget."""
> 
> This reverts commit 71554bc256b705fe959b7aa2fb2f24ed48782362.
> 
> Reason for revert: Google3
> 
> Original change's description:
> > Revert "Revert "Remove GrBackendRenderTargetDesc in favor of GrBackendRenderTarget.""
> > 
> > This reverts commit 807371c15bd742efb98a9df6e1dee73e8bda8af5.
> > 
> > Docs-Preview: https://skia.org/?cl=40260
> > Change-Id: I28e0434c455155ff39a5aaa4141abdf442474e87
> > Reviewed-on: https://skia-review.googlesource.com/40260
> > Reviewed-by: Greg Daniel <egdaniel@google.com>
> > Commit-Queue: Brian Salomon <bsalomon@google.com>
> 
> TBR=egdaniel@google.com,bsalomon@google.com
> 
> Change-Id: Ifdfa896a70db69935473276d12dce54de5c6b6f7
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://skia-review.googlesource.com/41500
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>

TBR=egdaniel@google.com,bsalomon@google.com

Change-Id: I827419bb19972c3644929a8c984bb9534baab0ba
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/41700
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

2 files changed, 19 insertions, 18 deletions

diff --git a/debugger/QT/SkGLWidget.cpp b/debugger/QT/SkGLWidget.cpp
index 0c65be03b5..98874d280d 100644
--- a/debugger/QT/SkGLWidget.cpp
+++ b/debugger/QT/SkGLWidget.cpp
@@ -55,11 +55,10 @@ void SkGLWidget::createRenderTarget() {
     glClearStencil(0);
     glClear(GL_STENCIL_BUFFER_BIT);
     fCurContext->resetContext();
-
-    GrBackendRenderTargetDesc desc = this->getDesc(this->width(), this->height());
-    desc.fOrigin = kBottomLeft_GrSurfaceOrigin;
-
-    fGpuSurface = SkSurface::MakeFromBackendRenderTarget(fCurContext.get(), desc, nullptr);
+    GrBackendRenderTarget backendRenderTarget = this->getBackendRenderTarget();
+    fGpuSurface = SkSurface::MakeFromBackendRenderTarget(fCurContext.get(), backendRenderTarget,
+                                                         kBottomLeft_GrSurfaceOrigin,
+                                                         nullptr, nullptr);
     fCanvas = fGpuSurface->getCanvas();
 }
 
@@ -78,18 +77,19 @@ void SkGLWidget::paintGL() {
     }
 }
 
-GrBackendRenderTargetDesc SkGLWidget::getDesc(int w, int h) {
-    GrBackendRenderTargetDesc desc;
-    desc.fWidth = SkScalarRoundToInt(this->width());
-    desc.fHeight = SkScalarRoundToInt(this->height());
-    desc.fConfig = kSkia8888_GrPixelConfig;
-    GR_GL_GetIntegerv(fCurIntf.get(), GR_GL_SAMPLES, &desc.fSampleCnt);
-    GR_GL_GetIntegerv(fCurIntf.get(), GR_GL_STENCIL_BITS, &desc.fStencilBits);
-    GrGLint buffer;
-    GR_GL_GetIntegerv(fCurIntf.get(), GR_GL_FRAMEBUFFER_BINDING, &buffer);
-    desc.fRenderTargetHandle = buffer;
-
-    return desc;
+GrBackendRenderTarget SkGLWidget::getBackendRenderTarget() {
+    GrGLFramebufferInfo info;
+    int stencilBits;
+    int sampleCnt;
+    GR_GL_GetIntegerv(fCurIntf.get(), GR_GL_FRAMEBUFFER_BINDING, &info.fFBOID);
+    GR_GL_GetIntegerv(fCurIntf.get(), GR_GL_SAMPLES, &sampleCnt);
+    GR_GL_GetIntegerv(fCurIntf.get(), GR_GL_STENCIL_BITS, &stencilBits);
+    return GrBackendRenderTarget(SkScalarRoundToInt(this->width()),
+                                 SkScalarRoundToInt(this->height()),
+                                 sampleCnt,
+                                 stencilBits,
+                                 kSkia8888_GrPixelConfig,
+                                 info);
 }
 
 #endif
diff --git a/debugger/QT/SkGLWidget.h b/debugger/QT/SkGLWidget.h
index e7493a533c..d590ffb565 100644
--- a/debugger/QT/SkGLWidget.h
+++ b/debugger/QT/SkGLWidget.h
@@ -16,6 +16,7 @@
 #include "SkDebugCanvas.h"
 #include "SkDebugger.h"
 #include "SkGpuDevice.h"
+#include "GrBackendSurface.h"
 #include "GrContext.h"
 #include "gl/GrGLInterface.h"
 #include "gl/GrGLUtil.h"
@@ -51,7 +52,7 @@ private:
     SkCanvas*        fCanvas;
 
     SkDebugger* fDebugger;
-    GrBackendRenderTargetDesc getDesc(int w, int h);
+    GrBackendRenderTarget getBackendRenderTarget();
 };
 
 #endif /* SK_SUPPORT_GPU */