Remove extra definitions of SkMovie

Remove extra definitions of SkMovie

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1830343004

Committed: https://skia.googlesource.com/skia/+/d442d32335a12964af1691b64977621d18048d20

[msarett, 2016-03-25 17:32:36]

Description was changed from

==========
Remove extra definitions of SkMovie

BUG=skia:
==========

to

==========
Remove extra definitions of SkMovie

BUG=skia:
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
==========

[msarett, 2016-03-25 17:33:15]

The CQ bit was checked by msarett@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-03-25 17:33:25]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1830343004/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1830343004/1

[commit-bot: I haz the power, 2016-03-25 17:34:35]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-03-25 17:34:36]

Dry run: Try jobs failed on following builders:
  Build-Mac-Clang-x86_64-Release-Trybot on client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Mac-Clang-x86_...)

[msarett, 2016-03-25 17:37:07]

The CQ bit was checked by msarett@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-03-25 17:37:16]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1830343004/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1830343004/20001

[msarett, 2016-03-25 17:39:39]

The CQ bit was checked by msarett@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-03-25 17:39:46]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1830343004/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1830343004/40001

[msarett, 2016-03-25 17:57:23]

msarett@google.com changed reviewers:
+ brianosman@google.com, scroggo@google.com

[msarett, 2016-03-25 17:57:23]

I think I must caused the following warning on Windows while refactoring...

images.SkMovie_FactoryDefault.obj : warning LNK4006: "public: static class
SkMovie * __cdecl SkMovie::DecodeStream(class SkStreamRewindable *)"
(?DecodeStream@SkMovie@@SAPAV1@PAVSkStreamRewindable@@@Z) already defined in
images.SkImageEncoder_WIC.obj; second definition ignored

Not exactly sure how I set this off - maybe when I needed to force the CG and
WIC ImageEncoders to link?

Anyway I think this'll fix it and is a good change in general.

[commit-bot: I haz the power, 2016-03-25 18:04:01]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-03-25 18:04:02]

Dry run: This issue passed the CQ dry run.

[Brian Osman, 2016-03-25 18:06:15]

lgtm

[msarett, 2016-03-25 18:06:53]

The CQ bit was checked by msarett@google.com

[commit-bot: I haz the power, 2016-03-25 18:07:00]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1830343004/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1830343004/40001

[commit-bot: I haz the power, 2016-03-25 18:08:17]

Description was changed from

==========
Remove extra definitions of SkMovie

BUG=skia:
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
==========

to

==========
Remove extra definitions of SkMovie

BUG=skia:
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...

Committed:
https://skia.googlesource.com/skia/+/d442d32335a12964af1691b64977621d18048d20
==========

[commit-bot: I haz the power, 2016-03-25 18:08:18]

Committed patchset #3 (id:40001) as
https://skia.googlesource.com/skia/+/d442d32335a12964af1691b64977621d18048d20