Title: [120564] trunk/Source
- Revision
- 120564
- Author
- [email protected]
- Date
- 2012-06-17 19:43:33 -0700 (Sun, 17 Jun 2012)
Log Message
Unreviewed build fix.
Source/WebCore:
* platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
(WebCore::CCLayerTreeHostImpl::removePassesWithCachedTextures):
Source/WebKit/chromium:
* tests/CCLayerTreeHostImplTest.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (120563 => 120564)
--- trunk/Source/WebCore/ChangeLog 2012-06-18 02:42:12 UTC (rev 120563)
+++ trunk/Source/WebCore/ChangeLog 2012-06-18 02:43:33 UTC (rev 120564)
@@ -1,3 +1,10 @@
+2012-06-17 MORITA Hajime <[email protected]>
+
+ Unreviewed build fix.
+
+ * platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
+ (WebCore::CCLayerTreeHostImpl::removePassesWithCachedTextures):
+
2012-06-17 Philippe Normand <[email protected]>
[GStreamer] optimize ::naturalSize()
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp (120563 => 120564)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp 2012-06-18 02:42:12 UTC (rev 120563)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp 2012-06-18 02:43:33 UTC (rev 120564)
@@ -418,7 +418,7 @@
void CCLayerTreeHostImpl::removePassesWithCachedTextures(CCRenderPassList& passes, CCRenderPassList& skippedPasses)
{
- for (ssize_t passIndex = passes.size() - 1; passIndex >= 0; --passIndex) {
+ for (int passIndex = passes.size() - 1; passIndex >= 0; --passIndex) {
CCRenderPass* currentPass = passes[passIndex].get();
const CCQuadList& quadList = currentPass->quadList();
CCQuadList::constBackToFrontIterator quadListIterator = quadList.backToFrontBegin();
Modified: trunk/Source/WebKit/chromium/ChangeLog (120563 => 120564)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-06-18 02:42:12 UTC (rev 120563)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-06-18 02:43:33 UTC (rev 120564)
@@ -1,3 +1,9 @@
+2012-06-17 MORITA Hajime <[email protected]>
+
+ Unreviewed build fix.
+
+ * tests/CCLayerTreeHostImplTest.cpp:
+
2012-06-17 Zeev Lieber <[email protected]>
[Chromium] Compositor should avoid drawing quads when cached textures are available and contents unchanged
Modified: trunk/Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp (120563 => 120564)
--- trunk/Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp 2012-06-18 02:42:12 UTC (rev 120563)
+++ trunk/Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp 2012-06-18 02:43:33 UTC (rev 120564)
@@ -1626,6 +1626,8 @@
EXPECT_EQ(expectedSwapRect.height(), actualSwapRect.height());
}
+} // namespace
+
class FakeLayerWithQuads : public CCLayerImpl {
public:
static PassOwnPtr<FakeLayerWithQuads> create(int id) { return adoptPtr(new FakeLayerWithQuads(id)); }
@@ -1645,6 +1647,8 @@
}
};
+namespace {
+
class MockContext : public FakeWebGraphicsContext3D {
public:
MOCK_METHOD1(useProgram, void(WebGLId program));
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
