Don't spam the GPU process with memory usage stats

cc/texture_uploader.cc

 // Copyright 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 "cc/texture_uploader.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/debug/alias.h"
 #include "base/debug/trace_event.h"
 #include "base/metrics/histogram.h"
 #include "cc/prioritized_resource.h"
 #include "cc/resource.h"
+#include "cc/util.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/vector2d.h"
 #include <public/WebGraphicsContext3D.h>
 
 namespace {
 
 // How many previous uploads to use when predicting future throughput.
 static const size_t uploadHistorySizeMax = 1000;
 static const size_t uploadHistorySizeInitial = 100;
 
 // Global estimated number of textures per second to maintain estimates across
 // subsequent instances of TextureUploader.
 // More than one thread will not access this variable, so we do not need to synchronize access.
 static const double defaultEstimatedTexturesPerSecond = 48.0 * 60.0;
 
 // Flush interval when performing texture uploads.
 const int textureUploadFlushPeriod = 4;
 
-unsigned int RoundUp(unsigned int n, unsigned int mul)
-{
-  return (((n - 1) / mul) * mul) + mul;
-}
-
 } // anonymous namespace
 
 namespace cc {
 
 TextureUploader::Query::Query(WebKit::WebGraphicsContext3D* context)
     : m_context(context)
     , m_queryId(0)
     , m_value(0)
     , m_hasValue(false)
     , m_isNonBlocking(false)
@@ skipping 180 matching lines @@
     TRACE_EVENT0("cc", "TextureUploader::uploadWithTexSubImage");
 
     // Offset from image-rect to source-rect.
     gfx::Vector2d offset(source_rect.origin() - image_rect.origin());
 
     const uint8* pixel_source;
     unsigned int bytes_per_pixel = Resource::BytesPerPixel(format);
     // Use 4-byte row alignment (OpenGL default) for upload performance.
     // Assuming that GL_UNPACK_ALIGNMENT has not changed from default.
     unsigned int upload_image_stride =
-        RoundUp(bytes_per_pixel * source_rect.width(), 4);
+        RoundUp(bytes_per_pixel * source_rect.width(), 4u);
 
     if (upload_image_stride == image_rect.width() * bytes_per_pixel && !offset.x()) {
         pixel_source = &image[image_rect.width() * bytes_per_pixel * offset.y()];
     } else {
         size_t needed_size = upload_image_stride * source_rect.height();
         if (m_subImageSize < needed_size) {
             m_subImage.reset(new uint8[needed_size]);
             m_subImageSize = needed_size;
         }
         // Strides not equal, so do a row-by-row memcpy from the
@@ skipping 49 matching lines @@
 
     TRACE_EVENT0("cc", "TextureUploader::uploadWithMapTexSubImage");
 
     // Offset from image-rect to source-rect.
     gfx::Vector2d offset(source_rect.origin() - image_rect.origin());
 
     unsigned int bytes_per_pixel = Resource::BytesPerPixel(format);
     // Use 4-byte row alignment (OpenGL default) for upload performance.
     // Assuming that GL_UNPACK_ALIGNMENT has not changed from default.
     unsigned int upload_image_stride =
-        RoundUp(bytes_per_pixel * source_rect.width(), 4);
+        RoundUp(bytes_per_pixel * source_rect.width(), 4u);
 
     // Upload tile data via a mapped transfer buffer
     uint8* pixel_dest = static_cast<uint8*>(
         m_context->mapTexSubImage2DCHROMIUM(GL_TEXTURE_2D,
                                             0,
                                             dest_offset.x(),
                                             dest_offset.y(),
                                             source_rect.width(),
                                             source_rect.height(),
                                             format,
@@ skipping 41 matching lines @@
             m_texturesPerSecondHistory.erase(m_texturesPerSecondHistory.begin());
             m_texturesPerSecondHistory.erase(--m_texturesPerSecondHistory.end());
         }
         m_texturesPerSecondHistory.insert(texturesPerSecond);
 
         m_availableQueries.append(m_pendingQueries.takeFirst());
     }
 }
 
 }  // namespace cc