Chromium Code Reviews
Help | Chromium Project | Gerrit Changes | Sign in
(60)

Issue 7274032: Merge 89635 - 2011-06-23 John Bates <jbates@google.com> (Closed)

Created:
9 years, 8 months ago by jamesr
Modified:
9 years, 8 months ago
Reviewers:
jamesr
CC:
chromium-reviews
Base URL:
http://svn.webkit.org/repository/webkit/branches/chromium/782/
Visibility:
Public.

Description

Merge 89635 - 2011-06-23 John Bates <jbates@google.com>; Reviewed by James Robinson. Fix latch deadlock when GPU process crashes or context is lost. https://bugs.webkit.org/show_bug.cgi?id=63189 The main bug fix is to only set/wait latches if the child context has no errors. Additionally, the LayerChromium classes needed to be modified to not continue drawing when their corresponding contexts have errors. Otherwise, they would draw with invalid texture ids. Test: open particles WebGL demo in chrome, kill GPU process from Task Manager; observe no deadlock. * platform/graphics/chromium/LayerRendererChromium.cpp: (WebCore::LayerRendererChromium::LayerRendererChromium): (WebCore::LayerRendererChromium::updateAndDrawLayers): (WebCore::LayerRendererChromium::updateLayers): (WebCore::LayerRendererChromium::isCompositorContextLost): * platform/graphics/chromium/LayerRendererChromium.h: * platform/graphics/chromium/WebGLLayerChromium.cpp: (WebCore::WebGLLayerChromium::drawsContent): (WebCore::WebGLLayerChromium::updateCompositorResources): (WebCore::WebGLLayerChromium::setContext): * platform/graphics/chromium/WebGLLayerChromium.h: * platform/graphics/chromium/Canvas2DLayerChromium.cpp: (WebCore::Canvas2DLayerChromium::drawsContent): * platform/graphics/chromium/Canvas2DLayerChromium.h: 2011-06-23 John Bates <jbates@google.com>; Reviewed by James Robinson. Fix latch deadlock when GPU process crashes or context is lost https://bugs.webkit.org/show_bug.cgi?id=63189 * src/WebViewImpl.cpp: (WebKit::WebViewImpl::composite): BUG=84065 TBR=commit-queue@webkit.org Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=89960

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1075 lines, -72 lines) Patch
M Source/WebCore/platform/graphics/Extensions3D.h View 1 chunk +6 lines, -0 lines 0 comments Download
M Source/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.h View 1 chunk +1 line, -1 line 0 comments Download
Source/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.cpp View 2 chunks +10 lines, -1 line 0 comments Download
M Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h View 2 chunks +3 lines, -5 lines 0 comments Download
M Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp View 5 chunks +22 lines, -59 lines 0 comments Download
M Source/WebCore/platform/graphics/chromium/WebGLLayerChromium.h View 1 chunk +1 line, -1 line 0 comments Download
M Source/WebCore/platform/graphics/chromium/WebGLLayerChromium.cpp View 3 chunks +9 lines, -3 lines 0 comments Download
M Source/WebKit/chromium/ChangeLog View 1 chunk +1022 lines, -0 lines 0 comments Download
M Source/WebKit/chromium/src/WebViewImpl.cpp View 1 chunk +1 line, -2 lines 0 comments Download

Messages

Total messages: 1 (0 generated)
jamesr
9 years, 8 months ago (2011-06-28 21:28:13 UTC) #1

          

Powered by Google App Engine
This is Rietveld 408576698