cc: Use gfx:: Geometry types for positions, bounds, and related things.

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 "config.h"
 
 #include "cc/texture_uploader.h"
 
 #include <algorithm>
 #include <vector>
 
-#include "IntSize.h"
 #include "base/debug/alias.h"
 #include "base/debug/trace_event.h"
 #include "base/metrics/histogram.h"
 #include "cc/texture.h"
 #include "cc/prioritized_texture.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>
@@ skipping 177 matching lines @@
     base::debug::Alias(&source_rect_height);
     base::debug::Alias(&image_rect_x);
     base::debug::Alias(&image_rect_y);
     base::debug::Alias(&image_rect_width);
     base::debug::Alias(&image_rect_height);
     base::debug::Alias(&dest_offset_x);
     base::debug::Alias(&dest_offset_y);
     TRACE_EVENT0("cc", "TextureUploader::uploadWithTexSubImage");
 
     // Offset from image-rect to source-rect.
-    IntPoint offset(source_rect.x() - image_rect.x(),
-                    source_rect.y() - image_rect.y());
+    gfx::Vector2d offset(source_rect.origin() - image_rect.origin());
 
     const uint8_t* pixel_source;
     unsigned int bytes_per_pixel = Texture::bytesPerPixel(format);
 
     if (image_rect.width() == source_rect.width() && !offset.x()) {
         pixel_source = &image[bytes_per_pixel * offset.y() * image_rect.width()];
     } else {
         size_t needed_size = source_rect.width() * source_rect.height() * bytes_per_pixel;
         if (m_subImageSize < needed_size) {
             m_subImage.reset(new uint8_t[needed_size]);
@@ skipping 46 matching lines @@
     base::debug::Alias(&image_rect_x);
     base::debug::Alias(&image_rect_y);
     base::debug::Alias(&image_rect_width);
     base::debug::Alias(&image_rect_height);
     base::debug::Alias(&dest_offset_x);
     base::debug::Alias(&dest_offset_y);
 
     TRACE_EVENT0("cc", "TextureUploader::uploadWithMapTexSubImage");
 
     // Offset from image-rect to source-rect.
-    IntPoint offset(source_rect.x() - image_rect.x(),
-                    source_rect.y() - image_rect.y());
+    gfx::Vector2d offset(source_rect.origin() - image_rect.origin());
 
     // Upload tile data via a mapped transfer buffer
     uint8_t* pixel_dest = static_cast<uint8_t*>(
         m_context->mapTexSubImage2DCHROMIUM(GL_TEXTURE_2D,
                                             0,
                                             dest_offset.x(),
                                             dest_offset.y(),
                                             source_rect.width(),
                                             source_rect.height(),
                                             format,
@@ skipping 43 matching lines @@
             m_texturesPerSecondHistory.erase(m_texturesPerSecondHistory.begin());
             m_texturesPerSecondHistory.erase(--m_texturesPerSecondHistory.end());
         }
         m_texturesPerSecondHistory.insert(texturesPerSecond);
 
         m_availableQueries.append(m_pendingQueries.takeFirst());
     }
 }
 
 }