Source/WebKit/chromium/tests/TextureLayerChromiumTest.cpp - Issue 10384160: Merge 116722 - Sync with impl thread when removing references to external textures

Side by Side Diff

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

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

Side by Side Diff: Source/WebKit/chromium/tests/TextureLayerChromiumTest.cpp

Issue 10384160: Merge 116722 - Sync with impl thread when removing references to external textures (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/

Patch Set: Created 8 years, 7 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 unified diff | Download patch

« no previous file with comments | « Source/WebKit/chromium/WebKit.gypi ('k') | no next file » | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2012 Google Inc. All rights reserved.	2 * Copyright (C) 2012 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 * 1. Redistributions of source code must retain the above copyright	7 * 1. Redistributions of source code must retain the above copyright

8 * notice, this list of conditions and the following disclaimer.	8 * notice, this list of conditions and the following disclaimer.

9 * 2. Redistributions in binary form must reproduce the above copyright	9 * 2. Redistributions in binary form must reproduce the above copyright

10 * notice, this list of conditions and the following disclaimer in the	10 * notice, this list of conditions and the following disclaimer in the

(...skipping 116 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
127 EXPECT_CALL(*m_layerTreeHost, acquireLayerTextures()).Times(0);	127 EXPECT_CALL(*m_layerTreeHost, acquireLayerTextures()).Times(0);

128 testLayer->setTextureId(1);	128 testLayer->setTextureId(1);

129 Mock::VerifyAndClearExpectations(m_layerTreeHost.get());	129 Mock::VerifyAndClearExpectations(m_layerTreeHost.get());

130	130

131 EXPECT_CALL(*m_layerTreeHost, acquireLayerTextures()).Times(AtLeast(1));	131 EXPECT_CALL(*m_layerTreeHost, acquireLayerTextures()).Times(AtLeast(1));

132 testLayer->removeFromParent();	132 testLayer->removeFromParent();

133 Mock::VerifyAndClearExpectations(m_layerTreeHost.get());	133 Mock::VerifyAndClearExpectations(m_layerTreeHost.get());

134 }	134 }

135	135

136 } // anonymous namespace	136 } // anonymous namespace

OLD	NEW