Merge changes I78ff6a85,Ic85c6405,Ibf903baa,I3a0459db,I35140385,I54790419,I6bfe5d24,Ia9f39b83,I5bcecd5a,I1de96683,I543c6810,I8a5b0878,I0ae670bf,Ide4d58dc,I28ebaf3d,I499d6631,Ie5090e0d,I6d3e5f1f

* changes:
  Merge WebKit at r78450: Update ThirdPartyProject.prop
  Merge WebKit at r78450: Add new Font::canExpandAroundIdeographsInComplexText()
  Merge WebKit at r78450: Add new ChromeClient::selectItemAlignmentFollowsMenuWritingDirection()
  Merge WebKit at r78450: FrameLoaderClient::didRunInsecureContent() signature changed
  Merge WebKit at r78450: HTMLAreaElement::getRect() renamed
  Merge WebKit at r78450: FrameLoader::url() removed
  Merge WebKit at r78450: HTMLParserQuirks removed
  Merge WebKit at r78450: TextRun::padding() renamed
  Merge WebKit at r78450: Use new FontMetrics
  Merge WebKit at r78450: GraphicsContext current path removed
  Merge WebKit at r78450: TransformationMatrix multiply methods renamed and meaning changed
  Merge WebKit at r78450: FontCustomPlatformData::fontPlatformData() signature changed
  Merge WebKit at r78450: IntRect::bottom()/right() renamed
  Merge WebKit at r78450: Fix remaining conflicts
  Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guard
  Merge WebKit at r78450: Fix conflicts in media controls
  Merge WebKit at r78450: Fix Makefiles
  Merge WebKit at r78450: Initial merge by git.

1 files changed, 25 insertions, 2 deletions

diff --git a/Source/WebCore/platform/graphics/gpu/Shader.h b/Source/WebCore/platform/graphics/gpu/Shader.h
index 4f62ca9..35d1a3b 100644
--- a/Source/WebCore/platform/graphics/gpu/Shader.h
+++ b/Source/WebCore/platform/graphics/gpu/Shader.h
@@ -33,6 +33,7 @@
 
 #include <wtf/Noncopyable.h>
 #include <wtf/PassOwnPtr.h>
+#include <wtf/text/WTFString.h>
 
 namespace WebCore {
 
@@ -42,13 +43,35 @@ class Color;
 
 class Shader {
     WTF_MAKE_NONCOPYABLE(Shader);
+public:
+    enum VertexType {
+        TwoDimensional,
+        LoopBlinnInterior,
+        LoopBlinnExterior
+    };
+
+    enum FillType {
+        SolidFill,
+        TextureFill
+    };
+
+    // Currently only applies to the Loop-Blinn vertex type.
+    enum AntialiasType {
+        NotAntialiased,
+        Antialiased
+    };
+
 protected:
     Shader(GraphicsContext3D*, unsigned program);
     ~Shader();
 
+    static String generateVertex(VertexType, FillType);
+    static String generateFragment(VertexType, FillType, AntialiasType);
+
     static void affineTo3x3(const AffineTransform&, float mat[9]);
-    static unsigned loadShader(GraphicsContext3D*, unsigned type, const char* shaderSource);
-    static unsigned loadProgram(GraphicsContext3D*, const char* vertexShaderSource, const char* fragmentShaderSource);
+    static void affineTo4x4(const AffineTransform&, float mat[16]);
+    static unsigned loadShader(GraphicsContext3D*, unsigned type, const String& shaderSource);
+    static unsigned loadProgram(GraphicsContext3D*, const String& vertexShaderSource, const String& fragmentShaderSource);
 
     GraphicsContext3D* m_context;
     unsigned m_program;