am 0203c47d: Introduces new shared library that will be used to playback SkPictures.
* commit '0203c47d888ed327c5df7d2233fc9ccb707d9725':
Introduces new shared library that will be used to playback SkPictures.
diff --git a/Android.mk b/Android.mk
index 2dc4b79..54de8e0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -508,3 +508,8 @@
# unit-tests
include $(BASE_PATH)/tests/Android.mk
+
+#############################################################
+# Build the legacy skia library for playback of saved webpages
+#
+include $(BASE_PATH)/legacy/Android.mk
diff --git a/legacy/Android.mk b/legacy/Android.mk
new file mode 100644
index 0000000..9bb40f1
--- /dev/null
+++ b/legacy/Android.mk
@@ -0,0 +1,313 @@
+BASE_PATH := $(call my-dir)
+LOCAL_PATH:= $(call my-dir)
+
+###############################################################################
+#
+# This is a older copy of Skia that is intended only to be used to support
+# playback of webpages saved as SkPictures in older versions of the Android
+# Browser. As such, all symbols are hidden with the exception of a few
+# functions that are needed to enable that behavior.
+#
+###############################################################################
+
+
+#############################################################
+# build the skia+fretype+png+jpeg+zlib+gif+webp library
+#
+
+include $(CLEAR_VARS)
+
+LOCAL_ARM_MODE := arm
+
+# need a flag to tell the C side when we're on devices with large memory
+# budgets (i.e. larger than the low-end devices that initially shipped)
+ifeq ($(ARCH_ARM_HAVE_VFP),true)
+ LOCAL_CFLAGS += -DANDROID_LARGE_MEMORY_DEVICE
+endif
+
+ifeq ($(TARGET_ARCH),x86)
+ LOCAL_CFLAGS += -DANDROID_LARGE_MEMORY_DEVICE
+endif
+
+ifneq ($(ARCH_ARM_HAVE_VFP),true)
+ LOCAL_CFLAGS += -DSK_SOFTWARE_FLOAT
+endif
+
+ifeq ($(ARCH_ARM_HAVE_NEON),true)
+ LOCAL_CFLAGS += -D__ARM_HAVE_NEON
+endif
+
+# special checks for alpha == 0 and alpha == 255 in S32A_Opaque_BlitRow32
+# procedures (C and assembly) seriously improve skia performance
+LOCAL_CFLAGS += -DTEST_SRC_ALPHA
+
+# using freetype's embolden allows us to adjust fake bold settings at
+# draw-time, at which point we know which SkTypeface is being drawn
+LOCAL_CFLAGS += -DSK_USE_FREETYPE_EMBOLDEN
+
+
+LOCAL_CFLAGS += -fvisibility=hidden
+LOCAL_SRC_FILES:= SavedPagePlayback.cpp
+
+LOCAL_SRC_FILES += \
+ src/core/Sk64.cpp \
+ src/core/SkAAClip.cpp \
+ src/core/SkAdvancedTypefaceMetrics.cpp \
+ src/core/SkAlphaRuns.cpp \
+ src/core/SkBitmap.cpp \
+ src/core/SkBitmapProcShader.cpp \
+ src/core/SkBitmapProcState.cpp \
+ src/core/SkBitmapProcState_matrixProcs.cpp \
+ src/core/SkBitmapSampler.cpp \
+ src/core/SkBitmap_scroll.cpp \
+ src/core/SkBlitMask_D32.cpp \
+ src/core/SkBlitRow_D16.cpp \
+ src/core/SkBlitRow_D32.cpp \
+ src/core/SkBlitRow_D4444.cpp \
+ src/core/SkBlitter.cpp \
+ src/core/SkBlitter_4444.cpp \
+ src/core/SkBlitter_A1.cpp \
+ src/core/SkBlitter_A8.cpp \
+ src/core/SkBlitter_ARGB32.cpp \
+ src/core/SkBlitter_RGB16.cpp \
+ src/core/SkBlitter_Sprite.cpp \
+ src/core/SkBuffer.cpp \
+ src/core/SkCanvas.cpp \
+ src/core/SkChunkAlloc.cpp \
+ src/core/SkClampRange.cpp \
+ src/core/SkClipStack.cpp \
+ src/core/SkColor.cpp \
+ src/core/SkColorFilter.cpp \
+ src/core/SkColorTable.cpp \
+ src/core/SkComposeShader.cpp \
+ src/core/SkConcaveToTriangles.cpp \
+ src/core/SkConfig8888.cpp \
+ src/core/SkCordic.cpp \
+ src/core/SkCubicClipper.cpp \
+ src/core/SkData.cpp \
+ src/core/SkDebug.cpp \
+ src/core/SkDeque.cpp \
+ src/core/SkDevice.cpp \
+ src/core/SkDeviceProfile.cpp \
+ src/core/SkDither.cpp \
+ src/core/SkDraw.cpp \
+ src/core/SkEdgeBuilder.cpp \
+ src/core/SkEdgeClipper.cpp \
+ src/core/SkEdge.cpp \
+ src/core/SkFilterProc.cpp \
+ src/core/SkFlattenable.cpp \
+ src/core/SkFloat.cpp \
+ src/core/SkFloatBits.cpp \
+ src/core/SkFontHost.cpp \
+ src/core/SkGeometry.cpp \
+ src/core/SkGlyphCache.cpp \
+ src/core/SkGraphics.cpp \
+ src/core/SkLanguage.cpp \
+ src/core/SkLineClipper.cpp \
+ src/core/SkMallocPixelRef.cpp \
+ src/core/SkMask.cpp \
+ src/core/SkMaskFilter.cpp \
+ src/core/SkMath.cpp \
+ src/core/SkMatrix.cpp \
+ src/core/SkMetaData.cpp \
+ src/core/SkMMapStream.cpp \
+ src/core/SkPackBits.cpp \
+ src/core/SkPaint.cpp \
+ src/core/SkPath.cpp \
+ src/core/SkPathEffect.cpp \
+ src/core/SkPathHeap.cpp \
+ src/core/SkPathMeasure.cpp \
+ src/core/SkPicture.cpp \
+ src/core/SkPictureFlat.cpp \
+ src/core/SkPicturePlayback.cpp \
+ src/core/SkPictureRecord.cpp \
+ src/core/SkPixelRef.cpp \
+ src/core/SkPoint.cpp \
+ src/core/SkProcSpriteBlitter.cpp \
+ src/core/SkPtrRecorder.cpp \
+ src/core/SkQuadClipper.cpp \
+ src/core/SkRasterClip.cpp \
+ src/core/SkRasterizer.cpp \
+ src/core/SkRect.cpp \
+ src/core/SkRefDict.cpp \
+ src/core/SkRegion.cpp \
+ src/core/SkRegion_path.cpp \
+ src/core/SkScalar.cpp \
+ src/core/SkScalerContext.cpp \
+ src/core/SkScan.cpp \
+ src/core/SkScan_AntiPath.cpp \
+ src/core/SkScan_Antihair.cpp \
+ src/core/SkScan_Hairline.cpp \
+ src/core/SkScan_Path.cpp \
+ src/core/SkShader.cpp \
+ src/core/SkShape.cpp \
+ src/core/SkSpriteBlitter_ARGB32.cpp \
+ src/core/SkSpriteBlitter_RGB16.cpp \
+ src/core/SkStream.cpp \
+ src/core/SkString.cpp \
+ src/core/SkStroke.cpp \
+ src/core/SkStrokerPriv.cpp \
+ src/core/SkTSearch.cpp \
+ src/core/SkTypeface.cpp \
+ src/core/SkTypefaceCache.cpp \
+ src/core/SkUnPreMultiply.cpp \
+ src/core/SkUtils.cpp \
+ src/core/SkFlate.cpp \
+ src/core/SkWriter32.cpp \
+ src/core/SkXfermode.cpp \
+ src/effects/Sk1DPathEffect.cpp \
+ src/effects/Sk2DPathEffect.cpp \
+ src/effects/SkAvoidXfermode.cpp \
+ src/effects/SkArithmeticMode.cpp \
+ src/effects/SkBitmapCache.cpp \
+ src/effects/SkBlurDrawLooper.cpp \
+ src/effects/SkBlurImageFilter.cpp \
+ src/effects/SkBlurMask.cpp \
+ src/effects/SkBlurMaskFilter.cpp \
+ src/effects/SkColorFilters.cpp \
+ src/effects/SkColorMatrixFilter.cpp \
+ src/effects/SkCornerPathEffect.cpp \
+ src/effects/SkDashPathEffect.cpp \
+ src/effects/SkDiscretePathEffect.cpp \
+ src/effects/SkEffects.cpp \
+ src/effects/SkEmbossMask.cpp \
+ src/effects/SkEmbossMaskFilter.cpp \
+ src/effects/SkGradientShader.cpp \
+ src/effects/SkGroupShape.cpp \
+ src/effects/SkKernel33MaskFilter.cpp \
+ src/effects/SkLayerDrawLooper.cpp \
+ src/effects/SkLayerRasterizer.cpp \
+ src/effects/SkMorphologyImageFilter.cpp \
+ src/effects/SkPaintFlagsDrawFilter.cpp \
+ src/effects/SkPixelXorXfermode.cpp \
+ src/effects/SkPorterDuff.cpp \
+ src/effects/SkRectShape.cpp \
+ src/effects/SkTableColorFilter.cpp \
+ src/effects/SkTableMaskFilter.cpp \
+ src/effects/SkTestImageFilters.cpp \
+ src/effects/SkTransparentShader.cpp \
+ src/images/bmpdecoderhelper.cpp \
+ src/images/SkBitmapRegionDecoder.cpp \
+ src/images/SkCreateRLEPixelRef.cpp \
+ src/images/SkFDStream.cpp \
+ src/images/SkFlipPixelRef.cpp \
+ src/images/SkImageDecoder.cpp \
+ src/images/SkImageDecoder_Factory.cpp \
+ src/images/SkImageDecoder_libbmp.cpp \
+ src/images/SkImageDecoder_libgif.cpp \
+ src/images/SkImageDecoder_libico.cpp \
+ src/images/SkImageDecoder_libjpeg.cpp \
+ src/images/SkImageDecoder_libpng.cpp \
+ src/images/SkImageDecoder_libwebp.cpp \
+ src/images/SkImageDecoder_wbmp.cpp \
+ src/images/SkImageEncoder.cpp \
+ src/images/SkImageEncoder_Factory.cpp \
+ src/images/SkImageRef.cpp \
+ src/images/SkImageRefPool.cpp \
+ src/images/SkImageRef_GlobalPool.cpp \
+ src/images/SkJpegUtility.cpp \
+ src/images/SkMovie.cpp \
+ src/images/SkMovie_gif.cpp \
+ src/images/SkPageFlipper.cpp \
+ src/images/SkScaledBitmapSampler.cpp \
+ src/ports/FontHostConfiguration_android.cpp \
+ src/ports/SkDebug_android.cpp \
+ src/ports/SkGlobalInitialization_default.cpp \
+ src/ports/SkFontHost_FreeType.cpp \
+ src/ports/SkFontHost_sandbox_none.cpp \
+ src/ports/SkFontHost_android.cpp \
+ src/ports/SkFontHost_gamma.cpp \
+ src/ports/SkFontHost_tables.cpp \
+ src/ports/SkImageRef_ashmem.cpp \
+ src/ports/SkMemory_malloc.cpp \
+ src/ports/SkOSFile_stdio.cpp \
+ src/ports/SkThread_pthread.cpp \
+ src/ports/SkTime_Unix.cpp \
+ src/utils/SkBase64.cpp \
+ src/utils/SkBoundaryPatch.cpp \
+ src/utils/SkCamera.cpp \
+ src/utils/SkColorMatrix.cpp \
+ src/utils/SkCubicInterval.cpp \
+ src/utils/SkCullPoints.cpp \
+ src/utils/SkDeferredCanvas.cpp \
+ src/utils/SkDumpCanvas.cpp \
+ src/utils/SkInterpolator.cpp \
+ src/utils/SkLayer.cpp \
+ src/utils/SkMatrix44.cpp \
+ src/utils/SkMeshUtils.cpp \
+ src/utils/SkNinePatch.cpp \
+ src/utils/SkNWayCanvas.cpp \
+ src/utils/SkOSFile.cpp \
+ src/utils/SkParse.cpp \
+ src/utils/SkParseColor.cpp \
+ src/utils/SkParsePath.cpp \
+ src/utils/SkProxyCanvas.cpp \
+ src/utils/SkSfntUtils.cpp \
+ src/utils/SkUnitMappers.cpp
+
+ifeq ($(TARGET_ARCH),arm)
+
+ifeq ($(ARCH_ARM_HAVE_NEON),true)
+LOCAL_SRC_FILES += \
+ src/opts/memset16_neon.S \
+ src/opts/memset32_neon.S
+endif
+
+LOCAL_SRC_FILES += \
+ src/opts/opts_check_arm.cpp \
+ src/opts/memset.arm.S \
+ src/opts/SkBitmapProcState_opts_arm.cpp \
+ src/opts/SkBlitRow_opts_arm.cpp
+else
+LOCAL_SRC_FILES += \
+ src/opts/SkBlitRow_opts_none.cpp \
+ src/opts/SkBitmapProcState_opts_none.cpp \
+ src/opts/SkUtils_opts_none.cpp
+endif
+
+# these are for emoji support, needed by webkit
+LOCAL_SRC_FILES += \
+ emoji/EmojiFont.cpp
+
+LOCAL_SHARED_LIBRARIES := \
+ libcutils \
+ libemoji \
+ libjpeg \
+ libutils \
+ libz \
+ libexpat
+
+LOCAL_STATIC_LIBRARIES := \
+ libft2 \
+ libpng \
+ libgif \
+ libwebp-decode \
+ libwebp-encode
+
+LOCAL_C_INCLUDES += \
+ $(LOCAL_PATH)/src/core \
+ $(LOCAL_PATH)/include/core \
+ $(LOCAL_PATH)/include/config \
+ $(LOCAL_PATH)/include/effects \
+ $(LOCAL_PATH)/include/images \
+ $(LOCAL_PATH)/include/ports \
+ $(LOCAL_PATH)/include/utils \
+ $(LOCAL_PATH)/include/xml \
+ external/freetype/include \
+ external/zlib \
+ external/libpng \
+ external/giflib \
+ external/jpeg \
+ external/webp/include \
+ frameworks/opt/emoji \
+ external/expat/lib
+
+ifeq ($(NO_FALLBACK_FONT),true)
+ LOCAL_CFLAGS += -DNO_FALLBACK_FONT
+endif
+
+LOCAL_LDLIBS += -lpthread
+
+LOCAL_MODULE:= libskia_legacy
+
+include $(BUILD_SHARED_LIBRARY)
\ No newline at end of file
diff --git a/legacy/SavedPagePlayback.cpp b/legacy/SavedPagePlayback.cpp
new file mode 100644
index 0000000..f5cdd40
--- /dev/null
+++ b/legacy/SavedPagePlayback.cpp
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2012, The Android Open Source Project
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "SkBitmap.h"
+#include "SkCanvas.h"
+#include "SkMatrix.h"
+#include "SkPicture.h"
+#include "SkRegion.h"
+#include "SkStream.h"
+
+#define EXPORT_FUNC extern "C" __attribute__ ((visibility ("default")))
+
+EXPORT_FUNC int legacy_skia_create_picture(const void* pictureStream, int streamLength,
+ void**legacyPicture, int* width, int* height) {
+ SkMemoryStream stream(pictureStream, streamLength);
+ SkPicture* picture = new SkPicture(&stream);
+ *legacyPicture = picture;
+ *width = picture->width();
+ *height = picture->height();
+ return stream.peek();
+}
+
+EXPORT_FUNC void legacy_skia_delete_picture(void* legacyPicture) {
+ free(legacyPicture);
+}
+
+EXPORT_FUNC void legacy_skia_draw_picture(void* legacyPicture, void* matrixStorage,
+ void* clipStorage, int bitmapWidth,
+ int bitmapHeight, int bitmapConfig,
+ int bitmapRowBytes, void* pixels) {
+ SkMatrix matrix;
+ matrix.unflatten(matrixStorage);
+
+ SkRegion region;
+ region.unflatten(clipStorage);
+
+ SkBitmap bitmap;
+ bitmap.setConfig((SkBitmap::Config)bitmapConfig, bitmapWidth, bitmapHeight, bitmapRowBytes);
+ bitmap.setPixels(pixels);
+
+ SkCanvas canvas(bitmap);
+ canvas.setMatrix(matrix);
+ canvas.setClipRegion(region);
+ canvas.drawPicture(*(SkPicture*)legacyPicture);
+}
