Revert of Move GPU fences into sk_gpu_test

Revert of Move GPU fences into sk_gpu_test (patchset #17 id:310001 of https://codereview.chromium.org/2383383002/ )

Reason for revert:
This is breaking the android platform build with the following errors...

external/skia/dm/../tools/gpu/vk/VkTestContext.cpp:80:16: error: reinterpret_cast from 'VkFence' (aka 'unsigned long long') to 'sk_gpu_test::PlatformFence' (aka 'int') is not allowed
        return reinterpret_cast<sk_gpu_test::PlatformFence>(fence);
               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
external/skia/dm/../tools/gpu/vk/VkTestContext.cpp:84:25: error: reinterpret_cast from 'sk_gpu_test::PlatformFence' (aka 'int') to 'VkFence' (aka 'unsigned long long') is not allowed
        VkFence fence = reinterpret_cast<VkFence>(opaqueFence);
                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
external/skia/dm/../tools/gpu/vk/VkTestContext.cpp:91:25: error: reinterpret_cast from 'sk_gpu_test::PlatformFence' (aka 'int') to 'VkFence' (aka 'unsigned long long') is not allowed
        VkFence fence = reinterpret_cast<VkFence>(opaqueFence);
                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3 errors generated.

Original issue's description:
> Move GPU fences into sk_gpu_test
> 
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2383383002
> 
> Committed: https://skia.googlesource.com/skia/+/421a3c1cc1b227084c7c84618d0b6a6804faabef

TBR=egdaniel@google.com,bsalomon@google.com,jvanverth@google.com,csmartdalton@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

[djsollen, 2016-10-04 19:37:26]

The CQ bit was checked by djsollen@google.com

[djsollen, 2016-10-04 19:37:26]

Created Revert of Move GPU fences into sk_gpu_test

[commit-bot: I haz the power, 2016-10-04 19:37:30]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-10-04 19:37:33]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-10-04 19:37:34]

Failed to apply patch for tools/gpu/TestContext.h:
While running git apply --index -3 -p1;
  error: patch failed: tools/gpu/TestContext.h:25
  Falling back to three-way merge...
  Applied patch to 'tools/gpu/TestContext.h' with conflicts.
  U tools/gpu/TestContext.h

Patch:       tools/gpu/TestContext.h
Index: tools/gpu/TestContext.h
diff --git a/tools/gpu/TestContext.h b/tools/gpu/TestContext.h
index
d01cb02af2ad833e256b61f5e87ba4d348bf4f7d..ffa8cae8f9d76792d8e1a924500f396efb6f0861
100644
--- a/tools/gpu/TestContext.h
+++ b/tools/gpu/TestContext.h
@@ -9,8 +9,8 @@
 #ifndef TestContext_DEFINED
 #define TestContext_DEFINED
 
-#include "FenceSync.h"
 #include "GrTypes.h"
+#include "../private/SkGpuFenceSync.h"
 #include "../private/SkTemplates.h"
 
 namespace sk_gpu_test {
@@ -25,7 +25,6 @@
     virtual bool isValid() const = 0;
 
     bool fenceSyncSupport() const { return fFenceSync != nullptr; }
-    FenceSync* fenceSync() { SkASSERT(fFenceSync); return fFenceSync; }
 
     bool getMaxGpuFrameLag(int *maxFrameLag) const {
         if (!fFenceSync) {
@@ -74,8 +73,13 @@
     /** Wait until all GPU work is finished. */
     virtual void finish() = 0;
 
+    /**
+     * returns the fencesync object owned by this GLTestContext
+     */
+    SkGpuFenceSync *fenceSync() { return fFenceSync; }
+
 protected:
-    FenceSync* fFenceSync;
+    SkGpuFenceSync* fFenceSync;
 
     TestContext();
 
@@ -90,7 +94,7 @@
         kMaxFrameLag = 3
     };
 
-    PlatformFence fFrameFences[kMaxFrameLag - 1];
+    SkPlatformGpuFence fFrameFences[kMaxFrameLag - 1];
     int fCurrentFenceIdx;
 
     typedef SkNoncopyable INHERITED;

[csmartdalton, 2016-10-31 19:08:18]

Description was changed from

==========
Revert of Move GPU fences into sk_gpu_test (patchset #17 id:310001 of
https://codereview.chromium.org/2383383002/ )

Reason for revert:
This is breaking the android platform build with the following errors...

external/skia/dm/../tools/gpu/vk/VkTestContext.cpp:80:16: error:
reinterpret_cast from 'VkFence' (aka 'unsigned long long') to
'sk_gpu_test::PlatformFence' (aka 'int') is not allowed
        return reinterpret_cast<sk_gpu_test::PlatformFence>(fence);
               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
external/skia/dm/../tools/gpu/vk/VkTestContext.cpp:84:25: error:
reinterpret_cast from 'sk_gpu_test::PlatformFence' (aka 'int') to 'VkFence' (aka
'unsigned long long') is not allowed
        VkFence fence = reinterpret_cast<VkFence>(opaqueFence);
                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
external/skia/dm/../tools/gpu/vk/VkTestContext.cpp:91:25: error:
reinterpret_cast from 'sk_gpu_test::PlatformFence' (aka 'int') to 'VkFence' (aka
'unsigned long long') is not allowed
        VkFence fence = reinterpret_cast<VkFence>(opaqueFence);
                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3 errors generated.

Original issue's description:
> Move GPU fences into sk_gpu_test
> 
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2383383002
> 
> Committed:
https://skia.googlesource.com/skia/+/421a3c1cc1b227084c7c84618d0b6a6804faabef

TBR=egdaniel@google.com,bsalomon@google.com,jvanverth@google.com,csmartdalton...
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
==========

to

==========
Revert of Move GPU fences into sk_gpu_test (patchset #17 id:310001 of
https://codereview.chromium.org/2383383002/ )

Reason for revert:
This is breaking the android platform build with the following errors...

external/skia/dm/../tools/gpu/vk/VkTestContext.cpp:80:16: error:
reinterpret_cast from 'VkFence' (aka 'unsigned long long') to
'sk_gpu_test::PlatformFence' (aka 'int') is not allowed
        return reinterpret_cast<sk_gpu_test::PlatformFence>(fence);
               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
external/skia/dm/../tools/gpu/vk/VkTestContext.cpp:84:25: error:
reinterpret_cast from 'sk_gpu_test::PlatformFence' (aka 'int') to 'VkFence' (aka
'unsigned long long') is not allowed
        VkFence fence = reinterpret_cast<VkFence>(opaqueFence);
                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
external/skia/dm/../tools/gpu/vk/VkTestContext.cpp:91:25: error:
reinterpret_cast from 'sk_gpu_test::PlatformFence' (aka 'int') to 'VkFence' (aka
'unsigned long long') is not allowed
        VkFence fence = reinterpret_cast<VkFence>(opaqueFence);
                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3 errors generated.

Original issue's description:
> Move GPU fences into sk_gpu_test
> 
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2383383002
> 
> Committed:
https://skia.googlesource.com/skia/+/421a3c1cc1b227084c7c84618d0b6a6804faabef

TBR=egdaniel@google.com,bsalomon@google.com,jvanverth@google.com,csmartdalton...
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
==========

[csmartdalton, 2016-10-31 19:08:38]

Closed the CL, as the underlying issue has been resolved.