Revert to old behavior for swap buffers

src/gpu/gl/SkGLContext.cpp

 
 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "gl/SkGLContext.h"
 #include "GrGLUtil.h"
 #include "SkGpuFenceSync.h"
@@ skipping 60 matching lines @@
     }
 
     fGL.reset(nullptr);
 }
 
 void SkGLContext::makeCurrent() const {
     this->onPlatformMakeCurrent();
 }
 
 void SkGLContext::swapBuffers() {
+    this->onPlatformSwapBuffers();
+}
+
+void SkGLContext::waitOnSyncOrSwap() {
     if (!fFenceSync) {
         // Fallback on the platform SwapBuffers method for synchronization. This may have no effect.
-        this->onPlatformSwapBuffers();
+        this->swapBuffers();
         return;
     }
 
     if (fFrameFences[fCurrentFenceIdx]) {
         if (!fFenceSync->waitFence(fFrameFences[fCurrentFenceIdx], true)) {
             SkDebugf("WARNING: Wait failed for fence sync. Timings might not be accurate.\n");
         }
         fFenceSync->deleteFence(fFrameFences[fCurrentFenceIdx]);
     }
 
@@ skipping 79 matching lines @@
     GR_GL_CALL(fGL, TexParameteri(GR_GL_TEXTURE_RECTANGLE, GR_GL_TEXTURE_MIN_FILTER,
                                   GR_GL_NEAREST));
     GR_GL_CALL(fGL, TexParameteri(GR_GL_TEXTURE_RECTANGLE, GR_GL_TEXTURE_WRAP_S,
                                   GR_GL_CLAMP_TO_EDGE));    
     GR_GL_CALL(fGL, TexParameteri(GR_GL_TEXTURE_RECTANGLE, GR_GL_TEXTURE_WRAP_T,
                                   GR_GL_CLAMP_TO_EDGE));
     GR_GL_CALL(fGL, TexImage2D(GR_GL_TEXTURE_RECTANGLE, 0, internalFormat, width, height, 0,
                                externalFormat, externalType, data));
     return id;
 }