webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 16 insertions, 31 deletions

diff --git a/Source/WebCore/html/canvas/WebGLContextGroup.h b/Source/WebCore/html/canvas/WebGLContextGroup.h
index aa7036ae6..11b737032 100644
--- a/Source/WebCore/html/canvas/WebGLContextGroup.h
+++ b/Source/WebCore/html/canvas/WebGLContextGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2011-2017 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -10,10 +10,10 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. 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
@@ -23,49 +23,34 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WebGLContextGroup_h
-#define WebGLContextGroup_h
+#pragma once
 
-#include <WebGLRenderingContext.h>
-#include <wtf/HashSet.h>
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
+#include "WebGLRenderingContextBase.h"
 
 namespace WebCore {
 
-class GraphicsContext3D;
-class WebGLExtension;
-class WebGLSharedObject;
-class WebGLRenderingContext;
-
-typedef int ExceptionCode;
-
 class WebGLContextGroup : public RefCounted<WebGLContextGroup> {
 public:
-    static PassRefPtr<WebGLContextGroup> create();
-    virtual ~WebGLContextGroup();
+    static Ref<WebGLContextGroup> create();
+    ~WebGLContextGroup();
 
-    void addContext(WebGLRenderingContext*);
-    void removeContext(WebGLRenderingContext*);
+    void addContext(WebGLRenderingContextBase&);
+    void removeContext(WebGLRenderingContextBase&);
 
-    void addObject(WebGLSharedObject*);
-    void removeObject(WebGLSharedObject*);
+    void addObject(WebGLSharedObject&);
+    void removeObject(WebGLSharedObject&);
 
-    GraphicsContext3D* getAGraphicsContext3D();
+    GraphicsContext3D& getAGraphicsContext3D();
 
-    void loseContextGroup(WebGLRenderingContext::LostContextMode);
+    void loseContextGroup(WebGLRenderingContextBase::LostContextMode);
 
-  private:
-    friend class WebGLObject;
-
-    WebGLContextGroup();
+private:
+    WebGLContextGroup() = default;
 
     void detachAndRemoveAllObjects();
 
-    HashSet<WebGLRenderingContext*> m_contexts;
+    HashSet<WebGLRenderingContextBase*> m_contexts;
     HashSet<WebGLSharedObject*> m_groupObjects;
 };
 
 } // namespace WebCore
-
-#endif // WebGLContextGroup_h