Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Side by Side Diff: third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp

Issue 1738623004: Rename enums/functions that collide in chromium style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-4
Patch Set: get-names-5: rebase-and-stuff Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "bindings/core/v8/ScriptValueSerializer.h" 5 #include "bindings/core/v8/ScriptValueSerializer.h"
6 6
7 #include "bindings/core/v8/V8ArrayBuffer.h" 7 #include "bindings/core/v8/V8ArrayBuffer.h"
8 #include "bindings/core/v8/V8ArrayBufferView.h" 8 #include "bindings/core/v8/V8ArrayBufferView.h"
9 #include "bindings/core/v8/V8Blob.h" 9 #include "bindings/core/v8/V8Blob.h"
10 #include "bindings/core/v8/V8CompositorProxy.h" 10 #include "bindings/core/v8/V8CompositorProxy.h"
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 441
442 long long size; 442 long long size;
443 double lastModifiedMS; 443 double lastModifiedMS;
444 file.captureSnapshot(size, lastModifiedMS); 444 file.captureSnapshot(size, lastModifiedMS);
445 doWriteUint64(static_cast<uint64_t>(size)); 445 doWriteUint64(static_cast<uint64_t>(size));
446 doWriteNumber(lastModifiedMS); 446 doWriteNumber(lastModifiedMS);
447 } else { 447 } else {
448 doWriteUint32(static_cast<uint8_t>(0)); 448 doWriteUint32(static_cast<uint8_t>(0));
449 } 449 }
450 450
451 doWriteUint32(static_cast<uint8_t>((file.userVisibility() == File::IsUserVis ible) ? 1 : 0)); 451 doWriteUint32(static_cast<uint8_t>((file.getUserVisibility() == File::IsUser Visible) ? 1 : 0));
452 } 452 }
453 453
454 void SerializedScriptValueWriter::doWriteArrayBuffer(const DOMArrayBuffer& array Buffer) 454 void SerializedScriptValueWriter::doWriteArrayBuffer(const DOMArrayBuffer& array Buffer)
455 { 455 {
456 uint32_t byteLength = arrayBuffer.byteLength(); 456 uint32_t byteLength = arrayBuffer.byteLength();
457 doWriteUint32(byteLength); 457 doWriteUint32(byteLength);
458 append(static_cast<const uint8_t*>(arrayBuffer.data()), byteLength); 458 append(static_cast<const uint8_t*>(arrayBuffer.data()), byteLength);
459 } 459 }
460 460
461 void SerializedScriptValueWriter::doWriteString(const char* data, int length) 461 void SerializedScriptValueWriter::doWriteString(const char* data, int length)
(...skipping 1814 matching lines...) Expand 10 before | Expand all | Expand 10 after
2276 return false; 2276 return false;
2277 uint32_t objectReference = m_openCompositeReferenceStack[m_openCompositeRefe renceStack.size() - 1]; 2277 uint32_t objectReference = m_openCompositeReferenceStack[m_openCompositeRefe renceStack.size() - 1];
2278 m_openCompositeReferenceStack.shrink(m_openCompositeReferenceStack.size() - 1); 2278 m_openCompositeReferenceStack.shrink(m_openCompositeReferenceStack.size() - 1);
2279 if (objectReference >= m_objectPool.size()) 2279 if (objectReference >= m_objectPool.size())
2280 return false; 2280 return false;
2281 *object = m_objectPool[objectReference]; 2281 *object = m_objectPool[objectReference];
2282 return true; 2282 return true;
2283 } 2283 }
2284 2284
2285 } // namespace blink 2285 } // namespace blink
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | third_party/WebKit/Source/bindings/core/v8/SerializedScriptValueTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698