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

Side by Side Diff: third_party/WebKit/Source/wtf/BitVector.cpp

Issue 1422773008: Fixing remaining VC++ 2015 64-bit build breaks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync to latest Created 5 years, 1 month 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 /* 1 /*
2 * Copyright (C) 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2011 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 m_bitsOrPointer = makeInlineBits(0); 71 m_bitsOrPointer = makeInlineBits(0);
72 else 72 else
73 memset(outOfLineBits()->bits(), 0, byteCount(size())); 73 memset(outOfLineBits()->bits(), 0, byteCount(size()));
74 } 74 }
75 75
76 BitVector::OutOfLineBits* BitVector::OutOfLineBits::create(size_t numBits) 76 BitVector::OutOfLineBits* BitVector::OutOfLineBits::create(size_t numBits)
77 { 77 {
78 // Because of the way BitVector stores the pointer, memory tools 78 // Because of the way BitVector stores the pointer, memory tools
79 // will erroneously report a leak here. 79 // will erroneously report a leak here.
80 WTF_ANNOTATE_SCOPED_MEMORY_LEAK; 80 WTF_ANNOTATE_SCOPED_MEMORY_LEAK;
81 numBits = (numBits + bitsInPointer() - 1) & ~(bitsInPointer() - 1); 81 numBits = (numBits + bitsInPointer() - 1) & ~(bitsInPointer() - static_cast< size_t>(1));
Will Harris 2015/11/10 18:05:14 same as others
82 size_t size = sizeof(OutOfLineBits) + sizeof(uintptr_t) * (numBits / bitsInP ointer()); 82 size_t size = sizeof(OutOfLineBits) + sizeof(uintptr_t) * (numBits / bitsInP ointer());
83 void* allocation = Partitions::bufferMalloc(size); 83 void* allocation = Partitions::bufferMalloc(size);
84 OutOfLineBits* result = new (NotNull, allocation) OutOfLineBits(numBits); 84 OutOfLineBits* result = new (NotNull, allocation) OutOfLineBits(numBits);
85 return result; 85 return result;
86 } 86 }
87 87
88 void BitVector::OutOfLineBits::destroy(OutOfLineBits* outOfLineBits) 88 void BitVector::OutOfLineBits::destroy(OutOfLineBits* outOfLineBits)
89 { 89 {
90 Partitions::bufferFree(outOfLineBits); 90 Partitions::bufferFree(outOfLineBits);
91 } 91 }
(...skipping 24 matching lines...) Expand all
116 { 116 {
117 for (size_t i = 0; i < size(); ++i) { 117 for (size_t i = 0; i < size(); ++i) {
118 if (get(i)) 118 if (get(i))
119 out.printf("1"); 119 out.printf("1");
120 else 120 else
121 out.printf("-"); 121 out.printf("-");
122 } 122 }
123 } 123 }
124 124
125 } // namespace WTF 125 } // namespace WTF
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698