Fix reporting of Media.AcceleratedCompositingActive when false.

webkit/media/webmediaplayer_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/media/webmediaplayer_impl.h"
 
 #include <limits>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 483 matching lines @@
                                const WebKit::WebRect& rect) {
   paint(canvas, rect, 0xFF);
 }
 
 void WebMediaPlayerImpl::paint(WebCanvas* canvas,
                                const WebRect& rect,
                                uint8_t alpha) {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   DCHECK(proxy_);
 
+  if (!accelerated_compositing_reported_) {
+    accelerated_compositing_reported_ = true;
+    DCHECK_EQ(frame_->view()->isAcceleratedCompositingActive(), false);
+    UMA_HISTOGRAM_BOOLEAN("Media.AcceleratedCompositingActive", false);
+  }
+
   proxy_->Paint(canvas, rect, alpha);
 }
 
 bool WebMediaPlayerImpl::hasSingleSecurityOrigin() const {
   if (proxy_)
     return proxy_->HasSingleOrigin();
   return true;
 }
 
 WebMediaPlayer::MovieLoadType WebMediaPlayerImpl::movieLoadType() const {
@@ skipping 42 matching lines @@
   proxy_->GetCurrentFrame(&video_frame);
   if (video_frame.get())
     return new WebVideoFrameImpl(video_frame);
   return NULL;
 }
 
 void WebMediaPlayerImpl::putCurrentFrame(
     WebKit::WebVideoFrame* web_video_frame) {
   if (!accelerated_compositing_reported_) {
     accelerated_compositing_reported_ = true;
-    UMA_HISTOGRAM_BOOLEAN("Media.AcceleratedCompositingActive",
-                          frame_->view()->isAcceleratedCompositingActive());
+    DCHECK_EQ(frame_->view()->isAcceleratedCompositingActive(), true);
+    UMA_HISTOGRAM_BOOLEAN("Media.AcceleratedCompositingActive", true);
   }
   if (web_video_frame) {
     scoped_refptr<media::VideoFrame> video_frame(
         WebVideoFrameImpl::toVideoFrame(web_video_frame));
     proxy_->PutCurrentFrame(video_frame);
     delete web_video_frame;
   } else {
     proxy_->PutCurrentFrame(NULL);
   }
 }
@@ skipping 437 matching lines @@
   return audio_source_provider_;
 }
 
 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   incremented_externally_allocated_memory_ = true;
   v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory);
 }
 
 }  // namespace webkit_media