Title: [93131] trunk/Source/WebKit/chromium
- Revision
- 93131
- Author
- [email protected]
- Date
- 2011-08-16 11:23:44 -0700 (Tue, 16 Aug 2011)
Log Message
GraphicsContext3D should allow its hostWindow to be NULL
https://bugs.webkit.org/show_bug.cgi?id=66305
Allow the hostWindow param (and m_webViewImpl) to be NULL. This
makes it much easier to enable GPU acceleration at a lower level
in WebKit's platform/graphics layer, without needing access to the
Page* or HostWindow*. Also bump the chromium DEPS to chrome r96940,
which includes a similar change for the in-process GraphicsContext3D
implementations.
Reviewed by James Robinson.
* DEPS:
* src/GraphicsContext3DChromium.cpp:
(WebCore::GraphicsContext3DInternal::initialize):
(WebCore::GraphicsContext3DInternal::platformTexture):
(WebCore::GraphicsContext3DInternal::paintsIntoCanvasBuffer):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (93130 => 93131)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-08-16 18:07:20 UTC (rev 93130)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-08-16 18:23:44 UTC (rev 93131)
@@ -1,3 +1,23 @@
+2011-08-16 Stephen White <[email protected]>
+
+ GraphicsContext3D should allow its hostWindow to be NULL
+ https://bugs.webkit.org/show_bug.cgi?id=66305
+
+ Allow the hostWindow param (and m_webViewImpl) to be NULL. This
+ makes it much easier to enable GPU acceleration at a lower level
+ in WebKit's platform/graphics layer, without needing access to the
+ Page* or HostWindow*. Also bump the chromium DEPS to chrome r96940,
+ which includes a similar change for the in-process GraphicsContext3D
+ implementations.
+
+ Reviewed by James Robinson.
+
+ * DEPS:
+ * src/GraphicsContext3DChromium.cpp:
+ (WebCore::GraphicsContext3DInternal::initialize):
+ (WebCore::GraphicsContext3DInternal::platformTexture):
+ (WebCore::GraphicsContext3DInternal::paintsIntoCanvasBuffer):
+
2011-08-16 Mikhail Naganov <[email protected]>
Web Inspector: [Chromium] Add deployment of NetworkPanel .css files to concatenated version
Modified: trunk/Source/WebKit/chromium/DEPS (93130 => 93131)
--- trunk/Source/WebKit/chromium/DEPS 2011-08-16 18:07:20 UTC (rev 93130)
+++ trunk/Source/WebKit/chromium/DEPS 2011-08-16 18:23:44 UTC (rev 93131)
@@ -32,7 +32,7 @@
vars = {
'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
- 'chromium_rev': '96618'
+ 'chromium_rev': '96940'
}
deps = {
@@ -127,8 +127,11 @@
From('chromium_deps', 'src/third_party/yasm/source/patched-yasm'),
'third_party/libjpeg_turbo':
From('chromium_deps', 'src/third_party/libjpeg_turbo'),
+ # TODO(dgrogan): Remove third_party/leveldb after WebCore.gyp is updated.
'third_party/leveldb':
From('chromium_deps', 'src/third_party/leveldb'),
+ 'third_party/leveldatabase/src':
+ From('chromium_deps', 'src/third_party/leveldatabase/src'),
'third_party/snappy/src':
From('chromium_deps', 'src/third_party/snappy/src'),
'third_party/sfntly/src/sfntly':
Modified: trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp (93130 => 93131)
--- trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp 2011-08-16 18:07:20 UTC (rev 93130)
+++ trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp 2011-08-16 18:23:44 UTC (rev 93131)
@@ -122,10 +122,8 @@
return false;
Chrome* chrome = static_cast<Chrome*>(hostWindow);
- m_webViewImpl = static_cast<WebKit::WebViewImpl*>(chrome->client()->webView());
+ m_webViewImpl = chrome ? static_cast<WebKit::WebViewImpl*>(chrome->client()->webView()) : 0;
- if (!m_webViewImpl)
- return false;
if (!webContext->initialize(webAttributes, m_webViewImpl, renderDirectlyToHostWindow))
return false;
m_impl = webContext.release();
@@ -150,6 +148,7 @@
Platform3DObject GraphicsContext3DInternal::platformTexture() const
{
+ ASSERT(m_webViewImpl);
m_impl->setParentContext(m_webViewImpl->graphicsContext3D());
return m_impl->getPlatformTextureId();
}
@@ -303,6 +302,7 @@
bool GraphicsContext3DInternal::paintsIntoCanvasBuffer() const
{
// If the gpu compositor is on then skip the readback and software rendering path.
+ ASSERT(m_webViewImpl);
return !m_webViewImpl->isAcceleratedCompositingActive();
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
