From 9d2718e7a2d58ce87a18ca4987553fd996180f3c Mon Sep 17 00:00:00 2001 From: John Reck Date: Wed, 5 Oct 2011 17:10:17 -0700 Subject: Fail fast if we won't be able to load Bug: 5416822 Change-Id: I105b514a84f2be15b460a4c85933d4eb1e897547 --- .../browser/SnapshotByteArrayOutputStream.java | 58 ++++++++++++++++++++++ src/com/android/browser/Tab.java | 2 +- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 src/com/android/browser/SnapshotByteArrayOutputStream.java (limited to 'src/com/android/browser') diff --git a/src/com/android/browser/SnapshotByteArrayOutputStream.java b/src/com/android/browser/SnapshotByteArrayOutputStream.java new file mode 100644 index 000000000..bfd1a76a9 --- /dev/null +++ b/src/com/android/browser/SnapshotByteArrayOutputStream.java @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2011 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.browser; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.OutputStream; + +public class SnapshotByteArrayOutputStream extends OutputStream { + + // Maximum size, just below CursorWindow's 2mb row limit + private static final int MAX_SIZE = 2000000; + private ByteArrayOutputStream mStream; + + public SnapshotByteArrayOutputStream() { + mStream = new ByteArrayOutputStream(MAX_SIZE); + } + + @Override + public synchronized void write(int oneByte) throws IOException { + checkError(1); + mStream.write(oneByte); + } + + @Override + public void write(byte[] buffer, int offset, int count) throws IOException { + checkError(count); + mStream.write(buffer, offset, count); + } + + private void checkError(int expandBy) throws IOException { + if ((size() + expandBy) > MAX_SIZE) { + throw new IOException("Exceeded max size!"); + } + } + + public int size() { + return mStream.size(); + } + + public byte[] toByteArray() { + return mStream.toByteArray(); + } + +} diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java index ae52943a5..8023375fc 100644 --- a/src/com/android/browser/Tab.java +++ b/src/com/android/browser/Tab.java @@ -2016,7 +2016,7 @@ class Tab implements PictureListener { public ContentValues createSnapshotValues() { if (mMainView == null) return null; - ByteArrayOutputStream bos = new ByteArrayOutputStream(); + SnapshotByteArrayOutputStream bos = new SnapshotByteArrayOutputStream(); try { GZIPOutputStream stream = new GZIPOutputStream(bos); if (!mMainView.saveViewState(stream)) { -- cgit v1.2.3