Merge WebKit at r61871: Initial merge by git.

Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5

1 files changed, 8 insertions, 3 deletions

diff --git a/WebCore/html/canvas/WebGLRenderingContext.h b/WebCore/html/canvas/WebGLRenderingContext.h
index 552efa9..d05d60b 100644
--- a/WebCore/html/canvas/WebGLRenderingContext.h
+++ b/WebCore/html/canvas/WebGLRenderingContext.h
@@ -315,8 +315,9 @@ class WebKitCSSMatrix;
 
         void addObject(CanvasObject*);
         void detachAndRemoveAllObjects();
-        PassRefPtr<WebGLTexture> findTexture(Platform3DObject);
-        PassRefPtr<WebGLRenderbuffer> findRenderbuffer(Platform3DObject);
+        WebGLTexture* findTexture(Platform3DObject);
+        WebGLRenderbuffer* findRenderbuffer(Platform3DObject);
+        WebGLBuffer* findBuffer(Platform3DObject);
 
         void markContextChanged();
         void cleanupAfterGraphicsCall(bool changed)
@@ -416,7 +417,7 @@ class WebKitCSSMatrix;
         // Helper function for copyTex{Sub}Image, check whether the internalformat
         // and the color buffer format of the current bound framebuffer combination
         // is valid.
-        bool isTexInternalformatColorBufferCombinationValid(unsigned long texInternalformat,
+        bool isTexInternalFormatColorBufferCombinationValid(unsigned long texInternalFormat,
                                                             unsigned long colorBufferFormat);
 
         // Helper function to get the current bound texture.
@@ -443,6 +444,10 @@ class WebKitCSSMatrix;
         // used only to warn about use of obsolete functions.
         void printWarningToConsole(const String& message);
 
+        // Helper function to validate input parameters for framebuffer functions.
+        // Generate GL error if parameters are illegal.
+        bool validateFramebufferFuncParameters(unsigned long target, unsigned long attachment);
+
         friend class WebGLStateRestorer;
     };