| Index: Source/core/platform/SharedBuffer.cpp
|
| diff --git a/Source/core/platform/SharedBuffer.cpp b/Source/core/platform/SharedBuffer.cpp
|
| index f883db474b8df56f312d5af8a6ce91c0b298aa17..b33d623b89f498bf1003b739ed0e14c55627455e 100644
|
| --- a/Source/core/platform/SharedBuffer.cpp
|
| +++ b/Source/core/platform/SharedBuffer.cpp
|
| @@ -21,7 +21,7 @@
|
| * 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.
|
| + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| #include "config.h"
|
| @@ -185,7 +185,7 @@ SharedBuffer::SharedBuffer(const unsigned char* data, int size)
|
| didCreateSharedBuffer(this);
|
| #endif
|
| }
|
| -
|
| +
|
| SharedBuffer::~SharedBuffer()
|
| {
|
| clear();
|
| @@ -203,8 +203,8 @@ PassRefPtr<SharedBuffer> SharedBuffer::adoptVector(Vector<char>& vector)
|
| return buffer.release();
|
| }
|
|
|
| -PassRefPtr<SharedBuffer> SharedBuffer::adoptPurgeableBuffer(PassOwnPtr<PurgeableBuffer> purgeableBuffer)
|
| -{
|
| +PassRefPtr<SharedBuffer> SharedBuffer::adoptPurgeableBuffer(PassOwnPtr<PurgeableBuffer> purgeableBuffer)
|
| +{
|
| ASSERT(!purgeableBuffer->isPurgeable());
|
| RefPtr<SharedBuffer> buffer = create();
|
| buffer->m_purgeableBuffer = purgeableBuffer;
|
| @@ -215,7 +215,7 @@ unsigned SharedBuffer::size() const
|
| {
|
| if (m_purgeableBuffer)
|
| return m_purgeableBuffer->size();
|
| -
|
| +
|
| return m_size;
|
| }
|
|
|
| @@ -231,7 +231,7 @@ const char* SharedBuffer::data() const
|
| {
|
| if (m_purgeableBuffer)
|
| return m_purgeableBuffer->data();
|
| -
|
| +
|
| return this->buffer().data();
|
| }
|
|
|
| @@ -326,9 +326,9 @@ PassRefPtr<SharedBuffer> SharedBuffer::copy() const
|
| }
|
|
|
| PassOwnPtr<PurgeableBuffer> SharedBuffer::releasePurgeableBuffer()
|
| -{
|
| - ASSERT(hasOneRef());
|
| - return m_purgeableBuffer.release();
|
| +{
|
| + ASSERT(hasOneRef());
|
| + return m_purgeableBuffer.release();
|
| }
|
|
|
| const Vector<char>& SharedBuffer::buffer() const
|
| @@ -370,7 +370,7 @@ unsigned SharedBuffer::getSomeData(const char*& someData, unsigned position) con
|
| someData = m_buffer.data() + position;
|
| return consecutiveSize - position;
|
| }
|
| -
|
| +
|
| position -= consecutiveSize;
|
| unsigned segments = m_segments.size();
|
| unsigned maxSegmentedSize = segments * segmentSize;
|
|
|