Use the new name for SkFrontBufferedStream
Bug: skbug.com/10154
Test: CtsGraphicsTestCases
The API is being moved to a new file and renamed. Use the new API.
Remove an unncessary FIXME and comment in Movie.cpp. The hardcoded 6 is
fine, and the ownership is obvious now that we use smart pointers.
Change-Id: I79657626ccbd5fe2616d546c617d591928064106
diff --git a/libs/hwui/jni/Movie.cpp b/libs/hwui/jni/Movie.cpp
index ede0ca8..bb8c99a 100644
--- a/libs/hwui/jni/Movie.cpp
+++ b/libs/hwui/jni/Movie.cpp
@@ -1,7 +1,7 @@
#include "CreateJavaOutputStreamAdaptor.h"
+#include "FrontBufferedStream.h"
#include "GraphicsJNI.h"
#include <nativehelper/ScopedLocalRef.h>
-#include "SkFrontBufferedStream.h"
#include "Movie.h"
#include "SkStream.h"
#include "SkUtils.h"
@@ -100,10 +100,8 @@
// Need to buffer enough input to be able to rewind as much as might be read by a decoder
// trying to determine the stream's format. The only decoder for movies is GIF, which
// will only read 6.
- // FIXME: Get this number from SkImageDecoder
- // bufferedStream takes ownership of strm
- std::unique_ptr<SkStreamRewindable> bufferedStream(SkFrontBufferedStream::Make(
- std::unique_ptr<SkStream>(strm), 6));
+ std::unique_ptr<SkStreamRewindable> bufferedStream(
+ android::skia::FrontBufferedStream::Make(std::unique_ptr<SkStream>(strm), 6));
SkASSERT(bufferedStream.get() != NULL);
Movie* moov = Movie::DecodeStream(bufferedStream.get());