Update to new stable branch 1750

This also includes an updated ninja and chromium dependencies
needed on Windows.

Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>

1 files changed, 61 insertions, 0 deletions

diff --git a/chromium/third_party/WebKit/Source/platform/graphics/gpu/AcceleratedImageBufferSurface.cpp b/chromium/third_party/WebKit/Source/platform/graphics/gpu/AcceleratedImageBufferSurface.cpp
new file mode 100644
index 00000000000..d6c3159bafc
--- /dev/null
+++ b/chromium/third_party/WebKit/Source/platform/graphics/gpu/AcceleratedImageBufferSurface.cpp
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2013, 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
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "platform/graphics/gpu/AcceleratedImageBufferSurface.h"
+
+#include "platform/graphics/gpu/SharedGraphicsContext3D.h"
+#include "third_party/skia/include/gpu/SkGpuDevice.h"
+
+namespace WebCore {
+
+AcceleratedImageBufferSurface::AcceleratedImageBufferSurface(const IntSize& size, OpacityMode opacityMode, int msaaSampleCount)
+    : ImageBufferSurface(size, opacityMode)
+{
+    GrContext* grContext = SharedGraphicsContext3D::get()->grContext();
+    if (!grContext)
+        return;
+    RefPtr<SkGpuDevice> device = adoptRef(new SkGpuDevice(grContext, SkBitmap::kARGB_8888_Config, size.width(), size.height(), msaaSampleCount));
+    if (!device->accessRenderTarget())
+        return;
+    m_canvas = adoptPtr(new SkCanvas(device.get()));
+    clear();
+}
+
+Platform3DObject AcceleratedImageBufferSurface::getBackingTexture() const
+{
+    GrRenderTarget* renderTarget = m_canvas->getTopDevice()->accessRenderTarget();
+    if (renderTarget) {
+        return renderTarget->asTexture()->getTextureHandle();
+    }
+    return 0;
+}
+
+} // namespace WebCore