| Index: third_party/WebKit/Source/wtf/ArrayBuffer.cpp
|
| diff --git a/third_party/WebKit/Source/wtf/ArrayBuffer.cpp b/third_party/WebKit/Source/wtf/ArrayBuffer.cpp
|
| index 50583bf820e288c9d11cbd1d6fc4cb3440d7972d..359b780396651cac9c3baef57d64f394df6720e1 100644
|
| --- a/third_party/WebKit/Source/wtf/ArrayBuffer.cpp
|
| +++ b/third_party/WebKit/Source/wtf/ArrayBuffer.cpp
|
| @@ -30,76 +30,71 @@
|
|
|
| namespace WTF {
|
|
|
| -bool ArrayBuffer::transfer(ArrayBufferContents& result)
|
| -{
|
| - ASSERT(!isShared());
|
| - RefPtr<ArrayBuffer> keepAlive(this);
|
| -
|
| - if (!m_contents.data()) {
|
| - result.neuter();
|
| - return false;
|
| - }
|
| -
|
| - bool allViewsAreNeuterable = true;
|
| - for (ArrayBufferView* i = m_firstView; i; i = i->m_nextView) {
|
| - if (!i->isNeuterable())
|
| - allViewsAreNeuterable = false;
|
| - }
|
| -
|
| - if (allViewsAreNeuterable) {
|
| - m_contents.transfer(result);
|
| - } else {
|
| - m_contents.copyTo(result);
|
| - if (!result.data())
|
| - return false;
|
| - }
|
| -
|
| - while (m_firstView) {
|
| - ArrayBufferView* current = m_firstView;
|
| - removeView(current);
|
| - if (allViewsAreNeuterable || current->isNeuterable())
|
| - current->neuter();
|
| - }
|
| -
|
| - m_isNeutered = true;
|
| -
|
| - return true;
|
| +bool ArrayBuffer::transfer(ArrayBufferContents& result) {
|
| + ASSERT(!isShared());
|
| + RefPtr<ArrayBuffer> keepAlive(this);
|
| +
|
| + if (!m_contents.data()) {
|
| + result.neuter();
|
| + return false;
|
| + }
|
| +
|
| + bool allViewsAreNeuterable = true;
|
| + for (ArrayBufferView* i = m_firstView; i; i = i->m_nextView) {
|
| + if (!i->isNeuterable())
|
| + allViewsAreNeuterable = false;
|
| + }
|
| +
|
| + if (allViewsAreNeuterable) {
|
| + m_contents.transfer(result);
|
| + } else {
|
| + m_contents.copyTo(result);
|
| + if (!result.data())
|
| + return false;
|
| + }
|
| +
|
| + while (m_firstView) {
|
| + ArrayBufferView* current = m_firstView;
|
| + removeView(current);
|
| + if (allViewsAreNeuterable || current->isNeuterable())
|
| + current->neuter();
|
| + }
|
| +
|
| + m_isNeutered = true;
|
| +
|
| + return true;
|
| }
|
|
|
| -bool ArrayBuffer::shareContentsWith(ArrayBufferContents& result)
|
| -{
|
| - ASSERT(isShared());
|
| - RefPtr<ArrayBuffer> keepAlive(this);
|
| +bool ArrayBuffer::shareContentsWith(ArrayBufferContents& result) {
|
| + ASSERT(isShared());
|
| + RefPtr<ArrayBuffer> keepAlive(this);
|
|
|
| - if (!m_contents.data()) {
|
| - result.neuter();
|
| - return false;
|
| - }
|
| + if (!m_contents.data()) {
|
| + result.neuter();
|
| + return false;
|
| + }
|
|
|
| - m_contents.shareWith(result);
|
| - return true;
|
| + m_contents.shareWith(result);
|
| + return true;
|
| }
|
|
|
| -void ArrayBuffer::addView(ArrayBufferView* view)
|
| -{
|
| - view->m_buffer = this;
|
| - view->m_prevView = 0;
|
| - view->m_nextView = m_firstView;
|
| - if (m_firstView)
|
| - m_firstView->m_prevView = view;
|
| - m_firstView = view;
|
| +void ArrayBuffer::addView(ArrayBufferView* view) {
|
| + view->m_buffer = this;
|
| + view->m_prevView = 0;
|
| + view->m_nextView = m_firstView;
|
| + if (m_firstView)
|
| + m_firstView->m_prevView = view;
|
| + m_firstView = view;
|
| }
|
|
|
| -void ArrayBuffer::removeView(ArrayBufferView* view)
|
| -{
|
| - ASSERT(this == view->m_buffer);
|
| - if (view->m_nextView)
|
| - view->m_nextView->m_prevView = view->m_prevView;
|
| - if (view->m_prevView)
|
| - view->m_prevView->m_nextView = view->m_nextView;
|
| - if (m_firstView == view)
|
| - m_firstView = view->m_nextView;
|
| - view->m_prevView = view->m_nextView = 0;
|
| +void ArrayBuffer::removeView(ArrayBufferView* view) {
|
| + ASSERT(this == view->m_buffer);
|
| + if (view->m_nextView)
|
| + view->m_nextView->m_prevView = view->m_prevView;
|
| + if (view->m_prevView)
|
| + view->m_prevView->m_nextView = view->m_nextView;
|
| + if (m_firstView == view)
|
| + m_firstView = view->m_nextView;
|
| + view->m_prevView = view->m_nextView = 0;
|
| }
|
| -
|
| }
|
|
|