Merge 92255 - Source/WebCore: [Chromium] Use edge-distance method for layer anti-aliasing.

Source/WebCore/platform/graphics/gpu/TilingData.cpp

 /*
  * Copyright (c) 2010, 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 26 matching lines @@
 #include "FloatRect.h"
 #include "IntRect.h"
 #include <algorithm>
 
 using namespace std;
 
 namespace WebCore {
 
 static int computeNumTiles(int maxTextureSize, int totalSize, int borderTexels)
 {
-    int totalSizeWithBorder = totalSize + 2 * borderTexels;
+    if (maxTextureSize - 2 * borderTexels <= 0)
+        return totalSize > 0 && maxTextureSize >= totalSize ? 1 : 0;
 
-    if (maxTextureSize - 2 * borderTexels <= 0)
-        return 0;
-
-    int numTiles = max(1, 1 + (totalSizeWithBorder - 1 - 2 * borderTexels) / (maxTextureSize - 2 * borderTexels));
+    int numTiles = max(1, 1 + (totalSize - 1 - 2 * borderTexels) / (maxTextureSize - 2 * borderTexels));
     return totalSize > 0 ? numTiles : 0;
 }
 
 TilingData::TilingData(int maxTextureSize, int totalSizeX, int totalSizeY, bool hasBorderTexels)
     : m_maxTextureSize(maxTextureSize)
     , m_totalSizeX(totalSizeX)
     , m_totalSizeY(totalSizeY)
     , m_borderTexels(hasBorderTexels ? 1 : 0)
 {
     recomputeNumTiles();
@@ skipping 11 matching lines @@
     m_maxTextureSize = maxTextureSize;
     recomputeNumTiles();
 }
 
 int TilingData::tileXIndexFromSrcCoord(int srcPos) const
 {
     if (numTilesX() <= 1)
         return 0;
 
     ASSERT(m_maxTextureSize - 2 * m_borderTexels);
-    int x = srcPos / (m_maxTextureSize - 2 * m_borderTexels);
+    int x = (srcPos - m_borderTexels) / (m_maxTextureSize - 2 * m_borderTexels);
     return min(max(x, 0), numTilesX() - 1);
 }
 
 int TilingData::tileYIndexFromSrcCoord(int srcPos) const
 {
     if (numTilesY() <= 1)
         return 0;
 
     ASSERT(m_maxTextureSize - 2 * m_borderTexels);
-    int y = srcPos / (m_maxTextureSize - 2 * m_borderTexels);
+    int y = (srcPos - m_borderTexels) / (m_maxTextureSize - 2 * m_borderTexels);
     return min(max(y, 0), numTilesY() - 1);
 }
 
 IntRect TilingData::tileBounds(int tile) const
 {
     assertTile(tile);
     int ix = tileXIndex(tile);
     int iy = tileYIndex(tile);
     int x = tilePositionX(ix);
     int y = tilePositionY(iy);
@@ skipping 22 matching lines @@
             y1--;
         if (tileYIndex(tile) < (numTilesY() - 1))
             y2++;
 
         bounds = IntRect(x1, y1, x2 - x1, y2 - y1);
     }
 
     return bounds;
 }
 
-IntRect TilingData::tileBoundsWithOuterBorder(int tile) const
-{
-    IntRect bounds = tileBounds(tile);
-
-    if (m_borderTexels)
-        bounds.inflate(1);
-
-    return bounds;
-}
-
 FloatRect TilingData::tileBoundsNormalized(int tile) const
 {
     assertTile(tile);
     FloatRect bounds(tileBounds(tile));
     bounds.scale(1.0f / m_totalSizeX, 1.0f / m_totalSizeY);
     return bounds;
 }
 
 int TilingData::tilePositionX(int xIndex) const
 {
@@ skipping 16 matching lines @@
 
     return pos;
 }
 
 int TilingData::tileSizeX(int xIndex) const
 {
     ASSERT(xIndex >= 0 && xIndex < numTilesX());
 
     if (!xIndex && m_numTilesX == 1)
         return m_totalSizeX;
+    if (!xIndex && m_numTilesX > 1)
+        return m_maxTextureSize - m_borderTexels;
     if (xIndex < numTilesX() - 1)
         return m_maxTextureSize - 2 * m_borderTexels;
     if (xIndex == numTilesX() - 1)
         return m_totalSizeX - tilePositionX(xIndex);
 
     ASSERT_NOT_REACHED();
     return 0;
 }
 
 int TilingData::tileSizeY(int yIndex) const
 {
     ASSERT(yIndex >= 0 && yIndex < numTilesY());
 
     if (!yIndex && m_numTilesY == 1)
         return m_totalSizeY;
+    if (!yIndex && m_numTilesY > 1)
+        return m_maxTextureSize - m_borderTexels;
     if (yIndex < numTilesY() - 1)
         return m_maxTextureSize - 2 * m_borderTexels;
     if (yIndex == numTilesY() - 1)
         return m_totalSizeY - tilePositionY(yIndex);
 
     ASSERT_NOT_REACHED();
     return 0;
 }
 
 IntRect TilingData::overlappedTileIndices(const WebCore::IntRect &srcRect) const
@@ skipping 23 matching lines @@
         return;
     }
 
     float srcRectIntersectedNormX = (srcRectIntersected.x() - srcRect.x()) / srcRect.width();
     float srcRectIntersectedNormY = (srcRectIntersected.y() - srcRect.y()) / srcRect.height();
     float srcRectIntersectedNormW = srcRectIntersected.width() / srcRect.width();
     float srcRectIntersectedNormH = srcRectIntersected.height() / srcRect.height();
 
     *newSrc = srcRectIntersected;
     newSrc->move(
-        -tileBounds.x() + m_borderTexels,
-        -tileBounds.y() + m_borderTexels);
+        -tileBounds.x() + ((tileXIndex(tile) > 0) ? m_borderTexels : 0),
+        -tileBounds.y() + ((tileYIndex(tile) > 0) ? m_borderTexels : 0));
 
     *newDst = FloatRect(
         srcRectIntersectedNormX * dstRect.width() + dstRect.x(),
         srcRectIntersectedNormY * dstRect.height() + dstRect.y(),
         srcRectIntersectedNormW * dstRect.width(),
         srcRectIntersectedNormH * dstRect.height());
 }
 
-IntPoint TilingData::textureOffset() const
+IntPoint TilingData::textureOffset(int xIndex, int yIndex) const
 {
-    return IntPoint(m_borderTexels, m_borderTexels);
+    int left = (!xIndex || m_numTilesX == 1) ? 0 : m_borderTexels;
+    int top = (!yIndex || m_numTilesY == 1) ? 0 : m_borderTexels;
+
+    return IntPoint(left, top);
 }
 
 void TilingData::recomputeNumTiles()
 {
     m_numTilesX = computeNumTiles(m_maxTextureSize, m_totalSizeX, m_borderTexels);
     m_numTilesY = computeNumTiles(m_maxTextureSize, m_totalSizeY, m_borderTexels);
 }
 
 }
 
 #endif