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

Unified Diff: cc/trees/layer_tree_host_unittest_context.cc

Issue 16968002: Move implementation of WebFilterOperations into cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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
Index: cc/trees/layer_tree_host_unittest_context.cc
diff --git a/cc/trees/layer_tree_host_unittest_context.cc b/cc/trees/layer_tree_host_unittest_context.cc
index f2349968947ab23fd76005e1da63941b5724c830..ac64a5472005d2cf9dcbc083b86b0e61a74eb364 100644
--- a/cc/trees/layer_tree_host_unittest_context.cc
+++ b/cc/trees/layer_tree_host_unittest_context.cc
@@ -16,6 +16,7 @@
#include "cc/layers/texture_layer_impl.h"
#include "cc/layers/video_layer.h"
#include "cc/layers/video_layer_impl.h"
+#include "cc/output/filter_operations.h"
#include "cc/test/fake_content_layer.h"
#include "cc/test/fake_content_layer_client.h"
#include "cc/test/fake_content_layer_impl.h"
@@ -35,7 +36,6 @@
#include "cc/trees/single_thread_proxy.h"
#include "gpu/GLES2/gl2extchromium.h"
#include "media/base/media.h"
-#include "third_party/WebKit/public/platform/WebFilterOperations.h"
using media::VideoFrame;
using WebKit::WebGraphicsContext3D;
@@ -420,8 +420,8 @@ class LayerTreeHostContextTestLostContextSucceedsWithContent
if (use_surface_) {
content_->SetForceRenderSurface(true);
// Filters require us to create an offscreen context.
- WebKit::WebFilterOperations filters;
- filters.append(WebKit::WebFilterOperation::createGrayscaleFilter(0.5f));
+ FilterOperations filters;
+ filters.Append(FilterOperation::CreateGrayscaleFilter(0.5f));
content_->SetFilters(filters);
content_->SetBackgroundFilters(filters);
}
@@ -551,8 +551,8 @@ class LayerTreeHostContextTestOffscreenContextFails
content_->SetIsDrawable(true);
content_->SetForceRenderSurface(true);
// Filters require us to create an offscreen context.
- WebKit::WebFilterOperations filters;
- filters.append(WebKit::WebFilterOperation::createGrayscaleFilter(0.5f));
+ FilterOperations filters;
+ filters.Append(FilterOperation::CreateGrayscaleFilter(0.5f));
content_->SetFilters(filters);
content_->SetBackgroundFilters(filters);

Powered by Google App Engine
This is Rietveld 408576698