Changeset 80328 in webkit
- Timestamp:
- Mar 3, 2011 10:25:48 PM (13 years ago)
- Location:
- trunk/Source
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r80323 r80328 1 2011-03-03 Ryosuke Niwa <rniwa@webkit.org> 2 3 Reviewed by Darin Adler. 4 5 Remove LOOSE_PASS_OWN_ARRAY_PTR from PassOwnArrayPtr.h 6 https://bugs.webkit.org/show_bug.cgi?id=55554 7 8 * runtime/JSGlobalObject.cpp: 9 (JSC::JSGlobalObject::copyGlobalsTo): Pass nullptr instead of 0. 10 (JSC::JSGlobalObject::resizeRegisters): Ditto; also use OwnArrayPtr instead of a raw pointer. 11 * runtime/JSGlobalObject.h: 12 (JSC::JSGlobalObject::addStaticGlobals): Ditto. 13 * wtf/PassOwnArrayPtr.h: Removed #define LOOSE_PASS_OWN_ARRAY_PTR 14 (WTF::PassOwnArrayPtr::PassOwnArrayPtr): Added a constructor that takes nullptr_t. 15 1 16 2011-03-03 Adam Barth <abarth@webkit.org> 2 17 -
trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp
r80303 r80328 415 415 // The register file is always a gc root so no barrier is needed here 416 416 memcpy(registerFile.start() - d()->registerArraySize, d()->registerArray.get(), d()->registerArraySize * sizeof(WriteBarrier<Unknown>)); 417 setRegisters(reinterpret_cast<WriteBarrier<Unknown>*>(registerFile.start()), 0, 0);417 setRegisters(reinterpret_cast<WriteBarrier<Unknown>*>(registerFile.start()), nullptr, 0); 418 418 } 419 419 } … … 427 427 if (d()->registerArray || !d()->registers) { 428 428 ASSERT(static_cast<size_t>(oldSize) == d()->registerArraySize); 429 WriteBarrier<Unknown>* registerArray = new WriteBarrier<Unknown>[newSize];429 OwnArrayPtr<WriteBarrier<Unknown> > registerArray = adoptArrayPtr(new WriteBarrier<Unknown>[newSize]); 430 430 for (int i = 0; i < oldSize; i++) 431 431 registerArray[newSize - oldSize + i].set(globalData(), this, d()->registerArray[i].get()); 432 setRegisters(registerArray + newSize, registerArray, newSize); 432 WriteBarrier<Unknown>* registers = registerArray.get() + newSize; 433 setRegisters(registers, registerArray.release(), newSize); 433 434 } else { 434 435 ASSERT(static_cast<size_t>(newSize) < globalData().interpreter->registerFile().maxGlobals()); -
trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h
r80303 r80328 319 319 size_t oldSize = d()->registerArraySize; 320 320 size_t newSize = oldSize + count; 321 WriteBarrier<Unknown>* registerArray = new WriteBarrier<Unknown>[newSize];321 OwnArrayPtr<WriteBarrier<Unknown> > registerArray = adoptArrayPtr(new WriteBarrier<Unknown>[newSize]); 322 322 if (d()->registerArray) { 323 323 // memcpy is safe here as we're copying barriers we already own from the existing array 324 memcpy(registerArray + count, d()->registerArray.get(), oldSize * sizeof(Register)); 325 } 326 327 setRegisters(registerArray + newSize, registerArray, newSize); 324 memcpy(registerArray.get() + count, d()->registerArray.get(), oldSize * sizeof(Register)); 325 } 326 327 WriteBarrier<Unknown>* registers = registerArray.get() + newSize; 328 setRegisters(registers, registerArray.release(), newSize); 328 329 329 330 for (int i = 0, index = -static_cast<int>(oldSize) - 1; i < count; ++i, --index) { -
trunk/Source/JavaScriptCore/wtf/PassOwnArrayPtr.h
r77785 r80328 31 31 #include "TypeTraits.h" 32 32 33 // Remove this once we make all WebKit code compatible with stricter rules about PassOwnArrayPtr.34 #define LOOSE_PASS_OWN_ARRAY_PTR35 36 33 namespace WTF { 37 34 … … 46 43 47 44 PassOwnArrayPtr() : m_ptr(0) { } 45 46 #if !defined(LOOSE_PASS_OWN_PTR) || !HAVE(NULLPTR) 47 PassOwnArrayPtr(std::nullptr_t) : m_ptr(0) { } 48 #endif 48 49 49 50 // It somewhat breaks the type system to allow transfer of ownership out of -
trunk/Source/WebCore/ChangeLog
r80327 r80328 1 2011-03-03 Ryosuke Niwa <rniwa@webkit.org> 2 3 Reviewed by Darin Adler. 4 5 Remove LOOSE_PASS_OWN_ARRAY_PTR from PassOwnArrayPtr.h 6 https://bugs.webkit.org/show_bug.cgi?id=55554 7 8 * platform/Length.cpp: 9 (WebCore::newLengthArray): Pass nullptr instead of 0. 10 1 11 2011-03-03 Nat Duca <nduca@chromium.org> 2 12 -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r80303 r80328 22579 22579 buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */; 22580 22580 compatibilityVersion = "Xcode 2.4"; 22581 developmentRegion = English; 22581 22582 hasScannedForEncodings = 1; 22582 22583 knownRegions = ( -
trunk/Source/WebCore/platform/Length.cpp
r77785 r80328 124 124 if (!str->length()) { 125 125 len = 1; 126 return 0;126 return nullptr; 127 127 } 128 128
Note: See TracChangeset
for help on using the changeset viewer.