Update libcc / bindings snapshot to WebKit r126830

cc/CCRenderSurfaceFilters.cpp

 // 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"
 
 #if USE(ACCELERATED_COMPOSITING)
 
 #include "CCRenderSurfaceFilters.h"
 
 #include "FloatSize.h"
 #include "SkBlurImageFilter.h"
 #include "SkCanvas.h"
 #include "SkColorMatrixFilter.h"
 #include "SkGpuDevice.h"
-#include "SkGrTexturePixelRef.h"
+#include "SkGrPixelRef.h"
 #include "SkMagnifierImageFilter.h"
 #include <public/WebFilterOperation.h>
 #include <public/WebFilterOperations.h>
 #include <public/WebGraphicsContext3D.h>
 #include <wtf/MathExtras.h>
 
 namespace {
 
 void getBrightnessMatrix(float amount, SkScalar matrix[20])
 {
@@ skipping 210 matching lines @@
 class FilterBufferState {
 public:
     FilterBufferState(GrContext* grContext, const WebCore::FloatSize& size, unsigned textureId)
         : m_grContext(grContext)
         , m_currentTexture(0)
     {
         // Wrap the source texture in a Ganesh platform texture.
         GrPlatformTextureDesc platformTextureDescription;
         platformTextureDescription.fWidth = size.width();
         platformTextureDescription.fHeight = size.height();
-        platformTextureDescription.fConfig = kSkia8888_PM_GrPixelConfig;
+        platformTextureDescription.fConfig = kSkia8888_GrPixelConfig;
         platformTextureDescription.fTextureHandle = textureId;
         SkAutoTUnref<GrTexture> texture(grContext->createPlatformTexture(platformTextureDescription));
         // Place the platform texture inside an SkBitmap.
         m_source.setConfig(SkBitmap::kARGB_8888_Config, size.width(), size.height());
-        m_source.setPixelRef(new SkGrTexturePixelRef(texture.get()))->unref();
+        m_source.setPixelRef(new SkGrPixelRef(texture.get()))->unref();
     }
 
     ~FilterBufferState() { }
 
     bool init(int filterCount)
     {
         int scratchCount = std::min(2, filterCount);
         GrTextureDesc desc;
         desc.fFlags = kRenderTarget_GrTextureFlagBit | kNoStencil_GrTextureFlagBit;
         desc.fSampleCnt = 0;
         desc.fWidth = m_source.width();
         desc.fHeight = m_source.height();
-        desc.fConfig = kSkia8888_PM_GrPixelConfig;
+        desc.fConfig = kSkia8888_GrPixelConfig;
         for (int i = 0; i < scratchCount; ++i) {
             GrAutoScratchTexture scratchTexture(m_grContext, desc, GrContext::kExact_ScratchTexMatch);
             m_scratchTextures[i].reset(scratchTexture.detach());
             if (!m_scratchTextures[i].get())
                 return false;
         }
         return true;
     }
 
     SkCanvas* canvas()
     {
         if (!m_canvas.get())
             createCanvas();
         return m_canvas.get();
     }
 
     const SkBitmap& source() { return m_source; }
 
     void swap()
     {
         m_canvas->flush();
         m_canvas.reset(0);
         m_device.reset(0);
 
-        m_source.setPixelRef(new SkGrTexturePixelRef(m_scratchTextures[m_currentTexture].get()))->unref();
+        m_source.setPixelRef(new SkGrPixelRef(m_scratchTextures[m_currentTexture].get()))->unref();
         m_currentTexture = 1 - m_currentTexture;
     }
 
 private:
     void createCanvas()
     {
         ASSERT(m_scratchTextures[m_currentTexture].get());
         m_device.reset(new SkGpuDevice(m_grContext, m_scratchTextures[m_currentTexture].get()));
         m_canvas.reset(new SkCanvas(m_device.get()));
         m_canvas->clear(0x0);
@@ skipping 133 matching lines @@
             break;
         }
         state.swap();
     }
     context3D->flush();
     return state.source();
 }
 
 }
 #endif // USE(ACCELERATED_COMPOSITING)