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

Source/WebCore/platform/graphics/chromium/LayerTilerChromium.h

 /*
  * 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:
  *
  * 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 57 matching lines @@
     void setLayerPosition(const IntPoint& position);
     // Change the tile size.  This may invalidate all the existing tiles.
     void setTileSize(const IntSize& size);
 
     bool skipsDraw() const { return m_skipsDraw; }
 
     // Reserves all existing and valid tile textures to protect them from being
     // recycled by the texture manager.
     void protectTileTextures(const IntRect& contentRect);
 
-    typedef ProgramBinding<VertexShaderQuad, FragmentShaderRGBATexAlpha> Program;
+    typedef ProgramBinding<VertexShaderTile, FragmentShaderRGBATexAlpha> Program;
     // Shader program that swaps red and blue components of texture.
     // Used when texture format does not match native color format.
-    typedef ProgramBinding<VertexShaderQuad, FragmentShaderRGBATexSwizzleAlpha> ProgramSwizzle;
+    typedef ProgramBinding<VertexShaderTile, FragmentShaderRGBATexSwizzleAlpha> ProgramSwizzle;
+
+    // Shader program that produces anti-aliased layer edges.
+    typedef ProgramBinding<VertexShaderTile, FragmentShaderRGBATexAlphaAA> ProgramAA;
+    typedef ProgramBinding<VertexShaderTile, FragmentShaderRGBATexSwizzleAlphaAA> ProgramSwizzleAA;
 
     // If this tiler has exactly one tile, return its texture. Otherwise, null.
     LayerTexture* getSingleTexture();
 
 private:
     LayerTilerChromium(LayerRendererChromium*, const IntSize& tileSize, BorderTexelOption);
 
     class Tile : public RefCounted<Tile> {
         WTF_MAKE_NONCOPYABLE(Tile);
     public:
@@ skipping 11 matching lines @@
         // Layer-space dirty rectangle that needs to be repainted.
         IntRect m_dirtyLayerRect;
     private:
         OwnPtr<LayerTexture> m_tex;
         int m_i;
         int m_j;
     };
 
     // Draw all tiles that intersect with contentRect.
     template <class T>
-    void drawTiles(const IntRect& contentRect, const TransformationMatrix&, float opacity, const T* program);
-
-    template <class T>
-    void drawTexturedQuad(GraphicsContext3D*, const FloatQuad&, const TransformationMatrix& projectionMatrix, const TransformationMatrix& drawMatrix,
-                          float width, float height, float opacity,
-                          float texTranslateX, float texTranslateY,
-                          float texScaleX, float texScaleY,
-                          const T* program);
+    void drawTiles(const IntRect& contentRect, const TransformationMatrix&, float opacity, const T* program, int fragmentTexTransformLocation, int edgeLocation);
 
     // Grow layer size to contain this rectangle.
     void growLayerToContain(const IntRect& contentRect);
 
     LayerRendererChromium* layerRenderer() const { return m_layerRenderer; }
     GraphicsContext3D* layerRendererContext() const;
     Tile* createTile(int i, int j);
     // Invalidate any tiles which do not intersect with the contentRect
     void invalidateTiles(const IntRect& contentRect);
     void reset();
     void contentRectToTileIndices(const IntRect& contentRect, int &left, int &top, int &right, int &bottom) const;
     IntRect contentRectToLayerRect(const IntRect& contentRect) const;
     IntRect layerRectToContentRect(const IntRect& layerRect) const;
 
     Tile* tileAt(int, int) const;
     IntRect tileContentRect(const Tile*) const;
     IntRect tileLayerRect(const Tile*) const;
-    IntRect tileTexRect(const Tile*) const;
 
     GC3Denum m_textureFormat;
 
     IntSize m_tileSize;
     IntPoint m_layerPosition;
 
     bool m_skipsDraw;
 
     // Default hash key traits for integers disallow 0 and -1 as a key, so
     // use a custom hash trait which disallows -1 and -2 instead.
@@ skipping 22 matching lines @@
     TilingData m_tilingData;
 
     LayerRendererChromium* m_layerRenderer;
 };
 
 }
 
 #endif // USE(ACCELERATED_COMPOSITING)
 
 #endif