Title: [170302] trunk/Source/WebCore
- Revision
- 170302
- Author
- [email protected]
- Date
- 2014-06-23 11:16:39 -0700 (Mon, 23 Jun 2014)
Log Message
[iOS] Use WebGLLayer rather than PlatformLayer in GraphicsContext3D
https://bugs.webkit.org/show_bug.cgi?id=134183
Follow-up review from Sam Weinig.
* platform/graphics/GraphicsContext3D.h: Merge another bit of MAC and IOS
code.
* ChangeLog: Actually read his review comments this time.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (170301 => 170302)
--- trunk/Source/WebCore/ChangeLog 2014-06-23 18:01:24 UTC (rev 170301)
+++ trunk/Source/WebCore/ChangeLog 2014-06-23 18:16:39 UTC (rev 170302)
@@ -153,14 +153,25 @@
[iOS] Use WebGLLayer rather than PlatformLayer in GraphicsContext3D
https://bugs.webkit.org/show_bug.cgi?id=134183
+ Follow-up review from Sam Weinig.
+
+ * platform/graphics/GraphicsContext3D.h: Merge another bit of MAC and IOS
+ code.
+ * ChangeLog: Actually read his review comments this time.
+
+2014-06-23 Dean Jackson <[email protected]>
+
+ [iOS] Use WebGLLayer rather than PlatformLayer in GraphicsContext3D
+ https://bugs.webkit.org/show_bug.cgi?id=134183
+
Reviewed by Sam Weinig.
GraphicsContext3D has a reference to a WebGLLayer that was
hidden behind a PlatformLayer. This meant we had to cast it
to use a WebGLLayer method.
- * platform/graphics/GraphicsContext3D.h: Replace RefPtr<PlatformLayer>
- with RefPtr<WebGLLayer>.
+ * platform/graphics/GraphicsContext3D.h: Replace RetainPtr<PlatformLayer>
+ with RetainPtr<WebGLLayer>.
* platform/graphics/mac/GraphicsContext3DMac.mm:
(WebCore::GraphicsContext3D::~GraphicsContext3D): No need to cast.
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h (170301 => 170302)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2014-06-23 18:01:24 UTC (rev 170301)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2014-06-23 18:16:39 UTC (rev 170302)
@@ -1004,13 +1004,10 @@
#if PLATFORM(COCOA)
RetainPtr<WebGLLayer> m_webGLLayer;
+ PlatformGraphicsContext3D m_contextObj;
#endif
-#if PLATFORM(IOS)
- PlatformGraphicsContext3D m_contextObj;
-#elif PLATFORM(MAC)
- CGLContextObj m_contextObj;
-#elif PLATFORM(WIN) && USE(CA)
+#if PLATFORM(WIN) && USE(CA)
RefPtr<PlatformCALayer> m_webGLLayer;
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
