summaryrefslogtreecommitdiffstats
path: root/content/common/gpu/image_transport_surface_fbo_mac.mm
diff options
context:
space:
mode:
authorachaulk <achaulk@chromium.org>2015-05-28 18:36:21 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-29 01:36:56 +0000
commitc794eda78e9ba3c46b550b433e9fe5a248d40104 (patch)
tree8054088552654845102920183531ee33d1c12914 /content/common/gpu/image_transport_surface_fbo_mac.mm
parentbcb07449ce226e9263cf4f2637a1656377782e17 (diff)
downloadchromium_src-c794eda78e9ba3c46b550b433e9fe5a248d40104.zip
chromium_src-c794eda78e9ba3c46b550b433e9fe5a248d40104.tar.gz
chromium_src-c794eda78e9ba3c46b550b433e9fe5a248d40104.tar.bz2
Adding status to swap buffers completion
This will give us more options than completing all swaps successfully, or losing context BUG=476966 TBR=torne - approved interface change Review URL: https://codereview.chromium.org/1084173004 Cr-Commit-Position: refs/heads/master@{#331906}
Diffstat (limited to 'content/common/gpu/image_transport_surface_fbo_mac.mm')
-rw-r--r--content/common/gpu/image_transport_surface_fbo_mac.mm14
1 files changed, 9 insertions, 5 deletions
diff --git a/content/common/gpu/image_transport_surface_fbo_mac.mm b/content/common/gpu/image_transport_surface_fbo_mac.mm
index f1aa838..102a6b3 100644
--- a/content/common/gpu/image_transport_surface_fbo_mac.mm
+++ b/content/common/gpu/image_transport_surface_fbo_mac.mm
@@ -169,9 +169,10 @@ void ImageTransportSurfaceFBO::AdjustBufferAllocation() {
}
}
-bool ImageTransportSurfaceFBO::SwapBuffers() {
+gfx::SwapResult ImageTransportSurfaceFBO::SwapBuffers() {
TRACE_EVENT0("gpu", "ImageTransportSurfaceFBO::SwapBuffers");
- return SwapBuffersInternal();
+ return SwapBuffersInternal() ? gfx::SwapResult::SWAP_ACK
+ : gfx::SwapResult::SWAP_FAILED;
}
bool ImageTransportSurfaceFBO::SwapBuffersInternal() {
@@ -208,10 +209,13 @@ void ImageTransportSurfaceFBO::SetRendererID(int renderer_id) {
context_->share_group()->SetRendererID(renderer_id);
}
-bool ImageTransportSurfaceFBO::PostSubBuffer(
- int x, int y, int width, int height) {
+gfx::SwapResult ImageTransportSurfaceFBO::PostSubBuffer(int x,
+ int y,
+ int width,
+ int height) {
TRACE_EVENT0("gpu", "ImageTransportSurfaceFBO::PostSubBuffer");
- return SwapBuffersInternal();
+ return SwapBuffersInternal() ? gfx::SwapResult::SWAP_ACK
+ : gfx::SwapResult::SWAP_FAILED;
}
bool ImageTransportSurfaceFBO::SupportsPostSubBuffer() {