diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-04 05:08:15 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-04 05:08:15 +0000 |
| commit | 1940c4ee397232a4948b0328e728024ea19e3f5f (patch) | |
| tree | 34571d6bff7ecc3904b54bfc3df97c906437b7f1 /content/common | |
| parent | 45413146bcedc4087f4a8862384dd1508411848d (diff) | |
| download | chromium_src-1940c4ee397232a4948b0328e728024ea19e3f5f.zip chromium_src-1940c4ee397232a4948b0328e728024ea19e3f5f.tar.gz chromium_src-1940c4ee397232a4948b0328e728024ea19e3f5f.tar.bz2 | |
cc: Use skia::RefPtr in place of raw pointers and SkAutoTUnref.
Safe reference counting for skia objects ahoy!
R=jamesr
BUG=163454
Depends on: https://codereview.chromium.org/11418217/
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/11412255
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170889 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common')
| -rw-r--r-- | content/common/cc_messages.cc | 3 | ||||
| -rw-r--r-- | content/common/cc_messages_unittest.cc | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/content/common/cc_messages.cc b/content/common/cc_messages.cc index bcdf0f0..d65e5f0 100644 --- a/content/common/cc_messages.cc +++ b/content/common/cc_messages.cc @@ -415,6 +415,7 @@ bool ParamTraits<cc::RenderPass>::Read( bool has_transparent_background; bool has_occlusion_from_outside_target_surface; WebKit::WebFilterOperations filters; + skia::RefPtr<SkImageFilter> filter; WebKit::WebFilterOperations background_filters; size_t shared_quad_state_list_size; size_t quad_list_size; @@ -438,7 +439,7 @@ bool ParamTraits<cc::RenderPass>::Read( has_transparent_background, has_occlusion_from_outside_target_surface, filters, - NULL, // TODO(danakj): filter isn't being serialized. + filter, // TODO(danakj): filter isn't being serialized. background_filters); for (size_t i = 0; i < shared_quad_state_list_size; ++i) { diff --git a/content/common/cc_messages_unittest.cc b/content/common/cc_messages_unittest.cc index 4e20e2b..0342690 100644 --- a/content/common/cc_messages_unittest.cc +++ b/content/common/cc_messages_unittest.cc @@ -235,6 +235,9 @@ TEST_F(CCMessagesTest, AllQuads) { arbitrary_filters2.append(WebFilterOperation::createBrightnessFilter( arbitrary_float2)); + // TODO(danakj): filter is not serialized. + skia::RefPtr<SkImageFilter> arbitrary_filter; + scoped_ptr<SharedQuadState> shared_state1_in = SharedQuadState::Create(); shared_state1_in->SetAll(arbitrary_matrix, arbitrary_rect1, @@ -361,7 +364,7 @@ TEST_F(CCMessagesTest, AllQuads) { arbitrary_bool1, arbitrary_bool2, arbitrary_filters1, - NULL, // TODO(danakj): filter is not serialized. + arbitrary_filter, // TODO(danakj): filter is not serialized. arbitrary_filters2); pass_in->shared_quad_state_list.append(shared_state1_in.Pass()); @@ -383,7 +386,7 @@ TEST_F(CCMessagesTest, AllQuads) { arbitrary_bool1, arbitrary_bool2, arbitrary_filters1, - NULL, // TODO(danakj): filter is not serialized. + arbitrary_filter, // TODO(danakj): filter is not serialized. arbitrary_filters2); pass_cmp->shared_quad_state_list.append(shared_state1_cmp.Pass()); |