Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(620)

Unified Diff: cc/CCPrioritizedTextureTest.cpp

Issue 10917153: Update cc snapshot to r127918 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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 | « cc/CCLayerTreeHostTest.cpp ('k') | cc/CCProxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCPrioritizedTextureTest.cpp
diff --git a/cc/CCPrioritizedTextureTest.cpp b/cc/CCPrioritizedTextureTest.cpp
index 1fec393381aca45f995896a1cd49bdf1aa4a6225..2f39561e797c1ad44f30a5367ce38e05d062fad9 100644
--- a/cc/CCPrioritizedTextureTest.cpp
+++ b/cc/CCPrioritizedTextureTest.cpp
@@ -11,8 +11,8 @@
#include "CCTexture.h"
#include "CCTiledLayerTestCommon.h"
#include "FakeCCGraphicsContext.h"
+#include "WebCompositorInitializer.h"
#include <gtest/gtest.h>
-#include <public/WebCompositor.h>
using namespace WebCore;
using namespace WebKitTests;
@@ -25,20 +25,17 @@ public:
CCPrioritizedTextureTest()
: m_textureSize(256, 256)
, m_textureFormat(GraphicsContext3D::RGBA)
+ , m_compositorInitializer(0)
, m_context(WebKit::createFakeCCGraphicsContext())
{
- WebKit::WebCompositor::initialize(0);
DebugScopedSetImplThread implThread;
m_resourceProvider = CCResourceProvider::create(m_context.get());
}
virtual ~CCPrioritizedTextureTest()
{
- {
- DebugScopedSetImplThread implThread;
- m_resourceProvider.clear();
- }
- WebKit::WebCompositor::shutdown();
+ DebugScopedSetImplThread implThread;
+ m_resourceProvider.clear();
}
size_t texturesMemorySize(size_t textureCount)
@@ -73,6 +70,7 @@ public:
protected:
const IntSize m_textureSize;
const GC3Denum m_textureFormat;
+ WebCompositorInitializer m_compositorInitializer;
OwnPtr<CCGraphicsContext> m_context;
OwnPtr<CCResourceProvider> m_resourceProvider;
};
« no previous file with comments | « cc/CCLayerTreeHostTest.cpp ('k') | cc/CCProxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698