Source/WebCore/platform/graphics/chromium/TiledLayerChromium.cpp - Issue 10146014: Merge 113677 - [chromium] Viewport is not filled when out of texture memory on mac

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/WebCore/platform/graphics/chromium/TiledLayerChromium.cpp

Issue 10146014: Merge 113677 - [chromium] Viewport is not filled when out of texture memory on mac (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/

Patch Set: Created 8 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « Source/WebCore/platform/graphics/chromium/LayerChromium.cpp ('k') | Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/WebCore/platform/graphics/chromium/TiledLayerChromium.cpp

===================================================================

--- Source/WebCore/platform/graphics/chromium/TiledLayerChromium.cpp (revision 114754)

+++ Source/WebCore/platform/graphics/chromium/TiledLayerChromium.cpp (working copy)

@@ -455,10 +455,7 @@

if (!tile->managedTexture()->reserve(m_tiler->tileSize(), m_textureFormat)) {

m_skipsIdlePaint = true;

if (!idle) {

- // If the background covers the viewport, always draw this

- // layer so that checkerboarded tiles will still draw.

- if (!backgroundCoversViewport())

- m_skipsDraw = true;

+ m_skipsDraw = true;

m_tiler->reset();

m_paintRect = IntRect();

m_requestedUpdateTilesRect = IntRect();

@@ -582,7 +579,8 @@

{

if (m_skipsDraw)

return Region();

+ if (opaque())

+ return visibleLayerRect();

return m_tiler->opaqueRegionInLayerRect(visibleLayerRect());

}