cc/CCLayerImpl.cpp - Issue 10898023: Update cc snapshot to WK r126941

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: cc/CCLayerImpl.cpp

Issue 10898023: Update cc snapshot to WK r126941 (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: rebased Created 8 years, 4 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:

Index: cc/CCLayerImpl.cpp

diff --git a/cc/CCLayerImpl.cpp b/cc/CCLayerImpl.cpp

index 0a5df9e65b007ed4bc39d3fdc27b9b7509aa78bd..8e35dca3facebe219eb8b246414b84734e5012c3 100644

--- a/cc/CCLayerImpl.cpp

+++ b/cc/CCLayerImpl.cpp

@@ -145,13 +145,13 @@ void CCLayerImpl::didDraw(CCResourceProvider*)

#endif

}

-void CCLayerImpl::appendDebugBorderQuad(CCQuadSink& quadList, const CCSharedQuadState* sharedQuadState) const

+void CCLayerImpl::appendDebugBorderQuad(CCQuadSink& quadList, const CCSharedQuadState* sharedQuadState, CCAppendQuadsData& appendQuadsData) const

{

if (!hasDebugBorders())

return;

IntRect contentRect(IntPoint(), contentBounds());

- quadList.append(CCDebugBorderDrawQuad::create(sharedQuadState, contentRect, debugBorderColor(), debugBorderWidth()));

+ quadList.append(CCDebugBorderDrawQuad::create(sharedQuadState, contentRect, debugBorderColor(), debugBorderWidth()), appendQuadsData);

}

CCResourceProvider::ResourceId CCLayerImpl::contentsResourceId() const

« no previous file with comments | « cc/CCLayerImpl.h ('k') | cc/CCLayerTreeHostImpl.cpp » ('j') | no next file with comments »