Changeset 93707 in webkit
- Timestamp:
- Aug 24, 2011 8:04:32 AM (13 years ago)
- Location:
- trunk/Source/WebKit/chromium
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/chromium/ChangeLog
r93692 r93707 1 2011-08-24 Brian Salomon <bsalomon@google.com> 2 3 [SKIA] Allow WebKitGraphicsContext3D implementation to provide a compatible GrGLInterface 4 https://bugs.webkit.org/show_bug.cgi?id=66809 5 6 Reviewed by Stephen White. 7 8 * public/WebGraphicsContext3D.h: 9 (WebKit::WebGraphicsContext3D::grGLInterface): 10 * src/GraphicsContext3DChromium.cpp: 11 (WebCore::GraphicsContext3DInternal::grContext): 12 1 13 2011-08-23 Adam Barth <abarth@webkit.org> 2 14 -
trunk/Source/WebKit/chromium/public/WebGraphicsContext3D.h
r93625 r93707 61 61 typedef WGC3Duint WebGLId; 62 62 63 #if WEBKIT_USING_SKIA 64 struct GrGLInterface; 65 #endif 66 63 67 class WebView; 64 68 … … 356 360 // state is sticky, rather than reported only once. 357 361 virtual WGC3Denum getGraphicsResetStatusARB() { return 0; /* GL_NO_ERROR */ } 362 363 #if WEBKIT_USING_SKIA 364 virtual GrGLInterface* grGLInterface() { return 0; } 365 #endif 358 366 }; 359 367 -
trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp
r93689 r93707 165 165 166 166 if (!m_grContext) { 167 m_grContext = GrContext::CreateGLShaderContext(); 167 GrPlatform3DContext glinterface = reinterpret_cast<GrPlatform3DContext>(m_impl->grGLInterface()); 168 m_grContext = GrContext::Create(kOpenGL_Shaders_GrEngine, glinterface); 168 169 if (m_grContext) 169 170 m_grContext->setTextureCacheLimits(maxTextureCacheCount, maxTextureCacheBytes);
Note: See TracChangeset
for help on using the changeset viewer.