commit 9ca27f39ddf7dafdc8ce97dba0fc9c4d1f07b7ed
author msarett <msarett@google.com> Tue Feb 23 08:21:21 2016 -0800
committer Commit bot <commit-bot@chromium.org> Tue Feb 23 08:21:21 2016 -0800
tree 3805f26f668134d909ff9283d7d049bcfa63552e
parent fda6cea7f88c2f46b3a80e9c25adb0d686e884fd

Remove unnecessary GOOGLE3 ifdefs from SkRawCodec

These should be fine now that SkJpegCodec is building in GOOGLE3.

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

Review URL: https://codereview.chromium.org/1718343002

src/codec/SkRawCodec.cpp

diff --git a/src/codec/SkRawCodec.cpp b/src/codec/SkRawCodec.cpp
index 655d14e..a006e50 100644
--- a/src/codec/SkRawCodec.cpp
+++ b/src/codec/SkRawCodec.cpp
@@ -9,9 +9,7 @@
 #include "SkCodecPriv.h"
 #include "SkColorPriv.h"
 #include "SkData.h"
-#if !defined(GOOGLE3)
 #include "SkJpegCodec.h"
-#endif
 #include "SkRawCodec.h"
 #include "SkRefCnt.h"
 #include "SkStream.h"
@@ -573,16 +571,12 @@
         ::piex::Error error = ::piex::GetPreviewImageData(&piexStream, &imageData);
 
         if (error == ::piex::Error::kOk && imageData.preview.length > 0) {
-#if !defined(GOOGLE3)
             // transferBuffer() is destructive to the rawStream. Abandon the rawStream after this
             // function call.
             // FIXME: one may avoid the copy of memoryStream and use the buffered rawStream.
             SkMemoryStream* memoryStream =
                 rawStream->transferBuffer(imageData.preview.offset, imageData.preview.length);
             return memoryStream ? SkJpegCodec::NewFromStream(memoryStream) : nullptr;
-#else
-            return nullptr;
-#endif
         } else if (error == ::piex::Error::kFail) {
             return nullptr;
         }