Merge 114475 - [chromium] Ensure RateLimiter waits for Swapbuffers completion

Source/WebCore/platform/graphics/chromium/RateLimiter.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 17 matching lines @@
 #if USE(ACCELERATED_COMPOSITING)
 
 #include "RateLimiter.h"
 
 #include "Extensions3DChromium.h"
 #include "GraphicsContext3D.h"
 #include "TraceEvent.h"
 
 namespace WebCore {
 
-PassRefPtr<RateLimiter> RateLimiter::create(GraphicsContext3D* context)
+PassRefPtr<RateLimiter> RateLimiter::create(GraphicsContext3D* context, RateLimiterClient *client)
 {
-    return adoptRef(new RateLimiter(context));
+    return adoptRef(new RateLimiter(context, client));
 }
 
-RateLimiter::RateLimiter(GraphicsContext3D* context)
+RateLimiter::RateLimiter(GraphicsContext3D* context, RateLimiterClient *client)
     : m_context(context)
     , m_timer(this, &RateLimiter::rateLimitContext)
+    , m_client(client)
 {
     ASSERT(context);
     ASSERT(context->getExtensions());
     m_contextSupportsRateLimitingExtension = context->getExtensions()->supports("GL_CHROMIUM_rate_limit_offscreen_context");
 }
 
 RateLimiter::~RateLimiter()
 {
 }
 
 void RateLimiter::start()
 {
     if (m_contextSupportsRateLimitingExtension && !m_timer.isActive())
         m_timer.startOneShot(0);
 }
 
 void RateLimiter::stop()
 {
     m_timer.stop();
 }
 
 void RateLimiter::rateLimitContext(Timer<RateLimiter>*)
 {
     TRACE_EVENT("RateLimiter::rateLimitContext", this, 0);
 
     Extensions3DChromium* extensions = static_cast<Extensions3DChromium*>(m_context->getExtensions());
 
+    m_client->rateLimit();
     extensions->rateLimitOffscreenContextCHROMIUM();
 }
 
 }
 #endif // USE(ACCELERATED_COMPOSITING)