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

Source/WebCore/platform/graphics/chromium/LayerRendererChromium.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 88 matching lines @@
 // Returns true if the matrix has no rotation, skew or perspective components to it.
 static bool isScaleOrTranslation(const TransformationMatrix& m)
 {
     return !m.m12() && !m.m13() && !m.m14()
            && !m.m21() && !m.m23() && !m.m24()
            && !m.m31() && !m.m32() && !m.m43()
            && m.m44();
 
 }
 
+static TransformationMatrix screenMatrix(int x, int y, int width, int height)
+{
+    TransformationMatrix screen;
+
+    // Map to viewport.
+    screen.translate3d(x, y, 0);
+    screen.scale3d(width, height, 0);
+
+    // Map x, y and z to unit square.
+    screen.translate3d(0.5, 0.5, 0.5);
+    screen.scale3d(0.5, 0.5, 0.5);
+
+    return screen;
+}
+
 PassRefPtr<LayerRendererChromium> LayerRendererChromium::create(CCLayerTreeHostClient* client, PassOwnPtr<LayerPainterChromium> contentPaint, bool accelerateDrawing)
 {
     RefPtr<GraphicsContext3D> context = client->createLayerTreeHostContext3D();
     if (!context)
         return 0;
 
     RefPtr<LayerRendererChromium> layerRenderer(adoptRef(new LayerRendererChromium(client, context, contentPaint, accelerateDrawing)));
     layerRenderer->init();
     if (!layerRenderer->hardwareCompositing())
         return 0;
@@ skipping 384 matching lines @@
 {
     if (m_viewportVisibleRect.isEmpty() || !m_rootLayer)
         return;
 
     TRACE_EVENT("LayerRendererChromium::drawLayers", this, 0);
     CCLayerImpl* rootDrawLayer = m_rootLayer->ccLayerImpl();
     makeContextCurrent();
 
     // The GL viewport covers the entire visible area, including the scrollbars.
     GLC(m_context.get(), m_context->viewport(0, 0, m_viewportVisibleRect.width(), m_viewportVisibleRect.height()));
+    m_windowMatrix = screenMatrix(0, 0, m_viewportVisibleRect.width(), m_viewportVisibleRect.height());
 
     // Bind the common vertex attributes used for drawing all the layers.
     m_sharedGeometry->prepareForDraw();
 
     // FIXME: These calls can be made once, when the compositor context is initialized.
     GLC(m_context.get(), m_context->disable(GraphicsContext3D::DEPTH_TEST));
     GLC(m_context.get(), m_context->disable(GraphicsContext3D::CULL_FACE));
 
     // Blending disabled by default. Root layer alpha channel on Windows is incorrect when Skia uses ClearType.
     GLC(m_context.get(), m_context->disable(GraphicsContext3D::BLEND));
@@ skipping 618 matching lines @@
 // Sets the coordinate range of content that ends being drawn onto the target render surface.
 // The target render surface is assumed to have an origin at 0, 0 and the width and height of
 // of the drawRect.
 void LayerRendererChromium::setDrawViewportRect(const IntRect& drawRect, bool flipY)
 {
     if (flipY)
         m_projectionMatrix = orthoMatrix(drawRect.x(), drawRect.maxX(), drawRect.maxY(), drawRect.y());
     else
         m_projectionMatrix = orthoMatrix(drawRect.x(), drawRect.maxX(), drawRect.y(), drawRect.maxY());
     GLC(m_context.get(), m_context->viewport(0, 0, drawRect.width(), drawRect.height()));
+    m_windowMatrix = screenMatrix(0, 0, drawRect.width(), drawRect.height());
 }
 
 
 
 void LayerRendererChromium::resizeOnscreenContent(const IntSize& size)
 {
     if (m_context)
         m_context->reshape(size.width(), size.height());
 }
 
@@ skipping 79 matching lines @@
 {
     if (!m_tilerProgramSwizzle)
         m_tilerProgramSwizzle = adoptPtr(new LayerTilerChromium::ProgramSwizzle(m_context.get()));
     if (!m_tilerProgramSwizzle->initialized()) {
         TRACE_EVENT("LayerRendererChromium::tilerProgramSwizzle::initialize", this, 0);
         m_tilerProgramSwizzle->initialize();
     }
     return m_tilerProgramSwizzle.get();
 }
 
+const LayerTilerChromium::ProgramAA* LayerRendererChromium::tilerProgramAA()
+{
+    if (!m_tilerProgramAA)
+        m_tilerProgramAA = adoptPtr(new LayerTilerChromium::ProgramAA(m_context.get()));
+    if (!m_tilerProgramAA->initialized()) {
+        TRACE_EVENT("LayerRendererChromium::tilerProgramAA::initialize", this, 0);
+        m_tilerProgramAA->initialize();
+    }
+    return m_tilerProgramAA.get();
+}
+
+const LayerTilerChromium::ProgramSwizzleAA* LayerRendererChromium::tilerProgramSwizzleAA()
+{
+    if (!m_tilerProgramSwizzleAA)
+        m_tilerProgramSwizzleAA = adoptPtr(new LayerTilerChromium::ProgramSwizzleAA(m_context.get()));
+    if (!m_tilerProgramSwizzleAA->initialized()) {
+        TRACE_EVENT("LayerRendererChromium::tilerProgramSwizzleAA::initialize", this, 0);
+        m_tilerProgramSwizzleAA->initialize();
+    }
+    return m_tilerProgramSwizzleAA.get();
+}
+
 const CCCanvasLayerImpl::Program* LayerRendererChromium::canvasLayerProgram()
 {
     if (!m_canvasLayerProgram)
         m_canvasLayerProgram = adoptPtr(new CCCanvasLayerImpl::Program(m_context.get()));
     if (!m_canvasLayerProgram->initialized()) {
         TRACE_EVENT("LayerRendererChromium::borderProgram::initialize", this, 0);
         m_canvasLayerProgram->initialize();
     }
     return m_canvasLayerProgram.get();
 }
@@ skipping 188 matching lines @@
 PassOwnPtr<CCLayerTreeHostImplProxy> LayerRendererChromium::createLayerTreeHostImplProxy()
 {
     OwnPtr<CCLayerTreeHostImplProxy> proxy = LayerRendererChromiumImplProxy::create(this);
     proxy->start();
     return proxy.release();
 }
 
 } // namespace WebCore
 
 #endif // USE(ACCELERATED_COMPOSITING)