mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
2121ac8f2e
- Bug 1207030 - Enable -Wshadow flag in more directories that have no -Wshadow warnings. r=glandium (0654c75bf5) - don't build hunspell unified (a576cbdc65) - Bug 1218315 - Replace NS_LITERAL_STRING(...).get() with MOZ_UTF16(...) on rdf. r=nfroyd (795b627c84) - Bug 138009 - Remove unused platform.js, now with packaging goodness, r=mossop (f7547f1f16) - Bug 1195168 - Use channel->ascynOpen2 src/nsAutoConfig.cpp (r=sicking) (23ed743739) - Bug 1197926 - Use channel->Open2() in extensions/pref/autoconfig/src/nsReadConfig.cpp (r=sicking) (a6372aa60a) - Bug 1231256 (part 1) - Remove unused nsBoxLayoutState parameters from many functions. r=roc. (9d57344ee6) - Bug 1231256 (part 2) - Remove unused BlobDirState parameters from SetLazyData(). r=jld. (f3d62d9754) - Bug 1231256 (part 3) - Remove unused parameter from TryToOuterize(). r=roc. (0dc80be011) - Bug 1231256 (part 4) - Remove dead SetContext() declaration. r=jfkthame. (4108786c72) - Bug 1231256 (part 5) - Remove dead FromCSSPerspectiveInfo() function. r=vlad. (a9980426b0) - Bug 1231256 (part 6) - Remove unused parameter from Damage functions. r=roc. (e74906d54a) - Bug 1231256 (part 7) - Remove unused parameters from two layout functions. r=roc. (1cdcf91a10) - Bug 1231256 (part 8) - Remove unused parameters from MouseClicked(). r=roc. (2acf1b532b) - Bug 1231256 (part 9) - Remove unused parameter from ShowPopup(). r=roc. (e57daff2ee) - Bug 1231256 (part 10) - Remove unused parameters from StartAPZDrag(). r=roc. (b8d8ed57f4) - Bug 1231256 (part 11) - Remove unused parameter from HidePopupsInList(). r=roc. (ab9ea00111) - Bug 1231256 (part 12) - Remove TraceableVectorOperations::canAppendWithoutRealloc. r=terrence. (dc1ae504d5) - Bug 1230911 - modified asseert in order to prevent null pointer dereference. r=roc (71dce2e51c) - Bug 1230913 - modified assert in order to prevent null pointer dereference. r=roc (91b6092a83) - Bug 1228952 - Move texture metadata out of the BufferTextureClient/Host's buffer. r=Sotaro (5783f02382) - Bug 1215005 - SourceSurface has thread-safe refcount now. r=bas (13a0f58815) - Bug 1215438 - Part 1: Add utility functions to support transferring ImageBitmap. r=roc (5837bc686b) - Bug 1212009 - ReadFullySerializableObjects() doesn't use the aIndex param and it can be removed, r=smaug (db1b7f2a2c) - Bug 1215438 - Part 2: Add transfer support for ImageBitmap. r=baku (5f428ddaa3) - Bug 1215438 - Part 3: CairoImage can use in any thread. r=roc (7e6d6562ef) - Bug 1215438 - Part 4: Rename CairoImage to SourceSurfaceImage. r=roc (e336d6bcd7) - Bug 1215438 - Part 5: Add test for imagebitmap transfer. r=roc (71c7dbc4a5) - Bug 1172796 - Part 1: ImageEncoder can be used on worker thread. r=seth (8aa6b4d9bc) - Bug 1172796 - Part 2: Add write-only flag for origin-clean check. r=roc (dc4a1d5ef4) - Bug 1172796 - Part 3: Implement OffscreenCanvas constructor. r=roc r=smaug (466bef6e1a) - Bug 1172796 - Part 4: Implement OffscreenCanvas::ToBlob. r=roc r=smaug (0afb84ecb2) - Bug 1172796 - Part 5: Implements OffscreenCanvas::TransferImageBitmap. r=roc r=smaug (2709566e26) - Bug 1172796 - Part 6: Implements ImageBitmap::Close(). r=roc r=smaug (a45e423d77) - Bug 1172796 - Part 7: Implements ImageBitmapRenderingContext. r=roc r=smaug (c5a30f3132) - Bug 1172796 - Part 8: Add ImageBitmapRenderingContext to test_intefaces.html r=smaug (e8786603b2) - Bug 1172796 - Part 9: Use gfxPrefs to get webgl.enable-prototype-webgl2. r=jgilbert (c4ee72d49c) - fix Bug 1230686 - use RefPtr<DrawTarget>& instead of DrawTarget* (f92f5fae12) - reapply per misspatch Bug 1200595 - Consolidate the TextureClient's destruction logic. (960eb012ae) - Bug 1215236 - "Remove compilation warnings in StructuredCloneHolder". r=smaug (0ba2fdb23b) - Bug 1222123 - Warning fix in CompositorD3D11.cpp. r=Bas (f8d36dbb71) - Bug 1219494 - Part 4. gfx/layers and gfxCrash. r=mchang (b4046ee2df) - Bug 1229533: Ensure our RenderingTargetView for the backbuffer and the backbuffer itself have no lingering references, and log if they do. r=milan (89c9eed426) - Bug 1222569 - remove unused variables in CompositorD3D9.cpp; r=Bas (05f5a61e66) - Bug 1198021 - When the ContentClient of a ClientTiledPaintedLayer changes, don't destroy the old content client until after the layer transaction has been sent. r=nical (901edd5f56) - Bug 901097 - FileReader API in workers, r=sicking, r=nfroyd (01a4023d7e) - Bug 1217307 - Remove some unnecessary null checks in dom/base/. r=njn (4411cefe18) - Bug 264412. Implement HTMLElement.innerText. r=smaug,mats (28306eabfb) - Bug 1119157: Fix false over-recursion in web worker threads by cleaning up thread info in the processes forked from Nuwa. a=asuth (be1fb6ca67) - Bug 1125091 - Make Nuwa be Valgrind-friendly. r=njn. (bade1e2e1f) - Bug 1144535: Respect caller-specifed thread attributes in creating threads in the Nuwa process. r=asuth (33acdcf8ca) - Bug 1216354 - Disable LSan leak checking by default in mozglue. r=glandium (c8177284b2) - Bug 1196859 - Block Roboform binaries written against old SDK. r=bsmedberg (bf21a047ea) - Bug 763395 - Add nlsp.dll to blocklist. r=bsmedberg (ab96eafdbe) - Bug 1136968 - Add YCWebCameraSource.ax to DLL blocklist. r=benjamin (735282235d) - Bug 1170141 - Block RealNetworks Browser Record Plugin due to startup crashes. r=ehan (21937f4bc1) - Bug 1222819 - Add Orbit Downloader .dlls to Windows blocklist. r=aklotz (e8446eda95) - Bug 1198186 - increase limit used to detect int values passed as first argument to LdrLoadDll, r=dmajor (89f5ae4a87) - Bug 1151506: Block long hex name DLLs due to startup crashes. r=bsmedberg (34c0b81bfc) - Bug 1160148: Also block AVX2 in Win7RTM, and move the code to mozglue. r=froydnj (61ab36c6c6) - Bug 1203350 - Unify arithmetic operators in TimeStamp; r=froydnj (a96aeb7e11) - Bug 1179550 - Always terminate the str buffer. r=erahm (0c07fcad4f) - No bug, add missing include to StackWalk.cpp, DONTBUILD (88beda3fbb) - Bug 989499 - Part 2: Use FramePointerStackwalk on windows. r=rjmuizel (3f0db58ded) - Bug 989499 - Part 1: Add a way to get the stack top. r=BenWa (a1bdae796f) - Bug 1193838 - Expose ProfileGatherer as an nsISupports through nsIProfiler for process parent actors. r=BenWa (07121dd03d) - Bug 1233835 - Fix TaskTracer double init assert. r=mconley (895511b141) - Bug 1193838 - Make ProfileGatherer exist during the lifetime of a GeckoSampler. r=BenWa (9ca73c74e4) - Revert "Bug 1172157 - Save malformed profile JSON to file to help debug." (r=BenWa) (e4fc0084d4) - Bug 1196845 - Fix invalid JSON in saved Java thread profile; r=BenWa (d5b542da81) - Bug 1145333 - Skip NativeStackAddrs that conflict with pseudoStackAddrs and jsStackAddrs when merging sampler stacks. r=mstange (b50a048ab2) - Bug 1122721 - Don't call pthread_get_stackaddr_np during sampling. r=mstange (c6818c45a2) - Bug 1229850 - Avoid unnecessary combobox dropdown calculations in the content process. r=dbaron (174530328f) - Bug 1187605 pt 1 - In vertical writing modes, add an 'orientation' attribute with value='left' or 'right' to the <select> control's dropdown button. r=smontagu (76f9cb3fcd) - Bug 1187605 pt 2 - Make the <select> dropdown arrow respect the 'orientation' attribute, if present. r=smontagu (bd58cd1f89)
464 lines
12 KiB
C++
464 lines
12 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
/*
|
|
* A class which represents a fragment of text (eg inside a text
|
|
* node); if only codepoints below 256 are used, the text is stored as
|
|
* a char*; otherwise the text is stored as a char16_t*
|
|
*/
|
|
|
|
#include "nsTextFragment.h"
|
|
#include "nsCRT.h"
|
|
#include "nsReadableUtils.h"
|
|
#include "nsMemory.h"
|
|
#include "nsBidiUtils.h"
|
|
#include "nsUnicharUtils.h"
|
|
#include "nsUTF8Utils.h"
|
|
#include "mozilla/MemoryReporting.h"
|
|
#include "mozilla/SSE.h"
|
|
#include "nsTextFragmentImpl.h"
|
|
#include <algorithm>
|
|
|
|
#define TEXTFRAG_WHITE_AFTER_NEWLINE 50
|
|
#define TEXTFRAG_MAX_NEWLINES 7
|
|
|
|
// Static buffer used for common fragments
|
|
static char* sSpaceSharedString[TEXTFRAG_MAX_NEWLINES + 1];
|
|
static char* sTabSharedString[TEXTFRAG_MAX_NEWLINES + 1];
|
|
static char sSingleCharSharedString[256];
|
|
|
|
// static
|
|
nsresult
|
|
nsTextFragment::Init()
|
|
{
|
|
// Create whitespace strings
|
|
uint32_t i;
|
|
for (i = 0; i <= TEXTFRAG_MAX_NEWLINES; ++i) {
|
|
sSpaceSharedString[i] = new char[1 + i + TEXTFRAG_WHITE_AFTER_NEWLINE];
|
|
sTabSharedString[i] = new char[1 + i + TEXTFRAG_WHITE_AFTER_NEWLINE];
|
|
sSpaceSharedString[i][0] = ' ';
|
|
sTabSharedString[i][0] = ' ';
|
|
uint32_t j;
|
|
for (j = 1; j < 1 + i; ++j) {
|
|
sSpaceSharedString[i][j] = '\n';
|
|
sTabSharedString[i][j] = '\n';
|
|
}
|
|
for (; j < (1 + i + TEXTFRAG_WHITE_AFTER_NEWLINE); ++j) {
|
|
sSpaceSharedString[i][j] = ' ';
|
|
sTabSharedString[i][j] = '\t';
|
|
}
|
|
}
|
|
|
|
// Create single-char strings
|
|
for (i = 0; i < 256; ++i) {
|
|
sSingleCharSharedString[i] = i;
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
// static
|
|
void
|
|
nsTextFragment::Shutdown()
|
|
{
|
|
uint32_t i;
|
|
for (i = 0; i <= TEXTFRAG_MAX_NEWLINES; ++i) {
|
|
delete [] sSpaceSharedString[i];
|
|
delete [] sTabSharedString[i];
|
|
sSpaceSharedString[i] = nullptr;
|
|
sTabSharedString[i] = nullptr;
|
|
}
|
|
}
|
|
|
|
nsTextFragment::~nsTextFragment()
|
|
{
|
|
ReleaseText();
|
|
MOZ_COUNT_DTOR(nsTextFragment);
|
|
}
|
|
|
|
void
|
|
nsTextFragment::ReleaseText()
|
|
{
|
|
if (mState.mLength && m1b && mState.mInHeap) {
|
|
moz_free(m2b); // m1b == m2b as far as moz_free is concerned
|
|
}
|
|
|
|
m1b = nullptr;
|
|
mState.mIsBidi = false;
|
|
|
|
// Set mState.mIs2b, mState.mInHeap, and mState.mLength = 0 with mAllBits;
|
|
mAllBits = 0;
|
|
}
|
|
|
|
nsTextFragment&
|
|
nsTextFragment::operator=(const nsTextFragment& aOther)
|
|
{
|
|
ReleaseText();
|
|
|
|
if (aOther.mState.mLength) {
|
|
if (!aOther.mState.mInHeap) {
|
|
m1b = aOther.m1b; // This will work even if aOther is using m2b
|
|
}
|
|
else {
|
|
size_t m2bSize = aOther.mState.mLength *
|
|
(aOther.mState.mIs2b ? sizeof(char16_t) : sizeof(char));
|
|
|
|
m2b = static_cast<char16_t*>(moz_malloc(m2bSize));
|
|
if (m2b) {
|
|
memcpy(m2b, aOther.m2b, m2bSize);
|
|
} else {
|
|
// allocate a buffer for a single REPLACEMENT CHARACTER
|
|
m2b = static_cast<char16_t*>(moz_xmalloc(sizeof(char16_t)));
|
|
m2b[0] = 0xFFFD; // REPLACEMENT CHARACTER
|
|
mState.mIs2b = true;
|
|
mState.mInHeap = true;
|
|
mState.mLength = 1;
|
|
}
|
|
}
|
|
|
|
if (m1b) {
|
|
mAllBits = aOther.mAllBits;
|
|
}
|
|
}
|
|
|
|
return *this;
|
|
}
|
|
|
|
static inline int32_t
|
|
FirstNon8BitUnvectorized(const char16_t *str, const char16_t *end)
|
|
{
|
|
typedef Non8BitParameters<sizeof(size_t)> p;
|
|
const size_t mask = p::mask();
|
|
const uint32_t alignMask = p::alignMask();
|
|
const uint32_t numUnicharsPerWord = p::numUnicharsPerWord();
|
|
const int32_t len = end - str;
|
|
int32_t i = 0;
|
|
|
|
// Align ourselves to a word boundary.
|
|
int32_t alignLen =
|
|
std::min(len, int32_t(((-NS_PTR_TO_INT32(str)) & alignMask) / sizeof(char16_t)));
|
|
for (; i < alignLen; i++) {
|
|
if (str[i] > 255)
|
|
return i;
|
|
}
|
|
|
|
// Check one word at a time.
|
|
const int32_t wordWalkEnd = ((len - i) / numUnicharsPerWord) * numUnicharsPerWord;
|
|
for (; i < wordWalkEnd; i += numUnicharsPerWord) {
|
|
const size_t word = *reinterpret_cast<const size_t*>(str + i);
|
|
if (word & mask)
|
|
return i;
|
|
}
|
|
|
|
// Take care of the remainder one character at a time.
|
|
for (; i < len; i++) {
|
|
if (str[i] > 255)
|
|
return i;
|
|
}
|
|
|
|
return -1;
|
|
}
|
|
|
|
#ifdef MOZILLA_MAY_SUPPORT_SSE2
|
|
namespace mozilla {
|
|
namespace SSE2 {
|
|
int32_t FirstNon8Bit(const char16_t *str, const char16_t *end);
|
|
} // namespace SSE2
|
|
} // namespace mozilla
|
|
#endif
|
|
|
|
/*
|
|
* This function returns -1 if all characters in str are 8 bit characters.
|
|
* Otherwise, it returns a value less than or equal to the index of the first
|
|
* non-8bit character in str. For example, if first non-8bit character is at
|
|
* position 25, it may return 25, or for example 24, or 16. But it guarantees
|
|
* there is no non-8bit character before returned value.
|
|
*/
|
|
static inline int32_t
|
|
FirstNon8Bit(const char16_t *str, const char16_t *end)
|
|
{
|
|
#ifdef MOZILLA_MAY_SUPPORT_SSE2
|
|
if (mozilla::supports_sse2()) {
|
|
return mozilla::SSE2::FirstNon8Bit(str, end);
|
|
}
|
|
#endif
|
|
|
|
return FirstNon8BitUnvectorized(str, end);
|
|
}
|
|
|
|
bool
|
|
nsTextFragment::SetTo(const char16_t* aBuffer, int32_t aLength, bool aUpdateBidi)
|
|
{
|
|
if (MOZ_UNLIKELY(aLength < 0 || static_cast<uint32_t>(aLength) >
|
|
NS_MAX_TEXT_FRAGMENT_LENGTH)) {
|
|
return false;
|
|
}
|
|
|
|
ReleaseText();
|
|
|
|
if (aLength == 0) {
|
|
return true;
|
|
}
|
|
|
|
char16_t firstChar = *aBuffer;
|
|
if (aLength == 1 && firstChar < 256) {
|
|
m1b = sSingleCharSharedString + firstChar;
|
|
mState.mInHeap = false;
|
|
mState.mIs2b = false;
|
|
mState.mLength = 1;
|
|
|
|
return true;
|
|
}
|
|
|
|
const char16_t *ucp = aBuffer;
|
|
const char16_t *uend = aBuffer + aLength;
|
|
|
|
// Check if we can use a shared string
|
|
if (aLength <= 1 + TEXTFRAG_WHITE_AFTER_NEWLINE + TEXTFRAG_MAX_NEWLINES &&
|
|
(firstChar == ' ' || firstChar == '\n' || firstChar == '\t')) {
|
|
if (firstChar == ' ') {
|
|
++ucp;
|
|
}
|
|
|
|
const char16_t* start = ucp;
|
|
while (ucp < uend && *ucp == '\n') {
|
|
++ucp;
|
|
}
|
|
const char16_t* endNewLine = ucp;
|
|
|
|
char16_t space = ucp < uend && *ucp == '\t' ? '\t' : ' ';
|
|
while (ucp < uend && *ucp == space) {
|
|
++ucp;
|
|
}
|
|
|
|
if (ucp == uend &&
|
|
endNewLine - start <= TEXTFRAG_MAX_NEWLINES &&
|
|
ucp - endNewLine <= TEXTFRAG_WHITE_AFTER_NEWLINE) {
|
|
char** strings = space == ' ' ? sSpaceSharedString : sTabSharedString;
|
|
m1b = strings[endNewLine - start];
|
|
|
|
// If we didn't find a space in the beginning, skip it now.
|
|
if (firstChar != ' ') {
|
|
++m1b;
|
|
}
|
|
|
|
mState.mInHeap = false;
|
|
mState.mIs2b = false;
|
|
mState.mLength = aLength;
|
|
|
|
return true;
|
|
}
|
|
}
|
|
|
|
// See if we need to store the data in ucs2 or not
|
|
int32_t first16bit = FirstNon8Bit(ucp, uend);
|
|
|
|
if (first16bit != -1) { // aBuffer contains no non-8bit character
|
|
// Use ucs2 storage because we have to
|
|
size_t m2bSize = aLength * sizeof(char16_t);
|
|
m2b = (char16_t *)moz_malloc(m2bSize);
|
|
if (!m2b) {
|
|
return false;
|
|
}
|
|
memcpy(m2b, aBuffer, m2bSize);
|
|
|
|
mState.mIs2b = true;
|
|
if (aUpdateBidi) {
|
|
UpdateBidiFlag(aBuffer + first16bit, aLength - first16bit);
|
|
}
|
|
|
|
} else {
|
|
// Use 1 byte storage because we can
|
|
char* buff = (char *)moz_malloc(aLength * sizeof(char));
|
|
if (!buff) {
|
|
return false;
|
|
}
|
|
|
|
// Copy data
|
|
LossyConvertEncoding16to8 converter(buff);
|
|
copy_string(aBuffer, aBuffer+aLength, converter);
|
|
m1b = buff;
|
|
mState.mIs2b = false;
|
|
}
|
|
|
|
// Setup our fields
|
|
mState.mInHeap = true;
|
|
mState.mLength = aLength;
|
|
|
|
return true;
|
|
}
|
|
|
|
void
|
|
nsTextFragment::CopyTo(char16_t *aDest, int32_t aOffset, int32_t aCount)
|
|
{
|
|
NS_ASSERTION(aOffset >= 0, "Bad offset passed to nsTextFragment::CopyTo()!");
|
|
NS_ASSERTION(aCount >= 0, "Bad count passed to nsTextFragment::CopyTo()!");
|
|
|
|
if (aOffset < 0) {
|
|
aOffset = 0;
|
|
}
|
|
|
|
if (uint32_t(aOffset + aCount) > GetLength()) {
|
|
aCount = mState.mLength - aOffset;
|
|
}
|
|
|
|
if (aCount != 0) {
|
|
if (mState.mIs2b) {
|
|
memcpy(aDest, m2b + aOffset, sizeof(char16_t) * aCount);
|
|
} else {
|
|
const char *cp = m1b + aOffset;
|
|
const char *end = cp + aCount;
|
|
LossyConvertEncoding8to16 converter(aDest);
|
|
copy_string(cp, end, converter);
|
|
}
|
|
}
|
|
}
|
|
|
|
bool
|
|
nsTextFragment::Append(const char16_t* aBuffer, uint32_t aLength, bool aUpdateBidi)
|
|
{
|
|
if (!aLength) {
|
|
return true;
|
|
}
|
|
|
|
// This is a common case because some callsites create a textnode
|
|
// with a value by creating the node and then calling AppendData.
|
|
if (mState.mLength == 0) {
|
|
if (MOZ_UNLIKELY(aLength > INT32_MAX)) {
|
|
return false;
|
|
}
|
|
return SetTo(aBuffer, aLength, aUpdateBidi);
|
|
}
|
|
|
|
// Should we optimize for aData.Length() == 0?
|
|
|
|
// Note: Using CheckedInt here is wrong as nsTextFragment is 29 bits and needs an
|
|
// explicit check for that length and not INT_MAX. Also, this method can be a very
|
|
// hot path and cause performance loss since CheckedInt isn't inlined.
|
|
if (MOZ_UNLIKELY(NS_MAX_TEXT_FRAGMENT_LENGTH - mState.mLength < aLength)) {
|
|
return false; // Would be overflowing if we'd continue.
|
|
}
|
|
|
|
if (mState.mIs2b) {
|
|
// Already a 2-byte string so the result will be too
|
|
char16_t* buff = (char16_t*)moz_realloc(m2b, (mState.mLength + aLength) * sizeof(char16_t));
|
|
if (!buff) {
|
|
return false;
|
|
}
|
|
|
|
memcpy(buff + mState.mLength, aBuffer, aLength * sizeof(char16_t));
|
|
mState.mLength += aLength;
|
|
m2b = buff;
|
|
|
|
if (aUpdateBidi) {
|
|
UpdateBidiFlag(aBuffer, aLength);
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
// Current string is a 1-byte string, check if the new data fits in one byte too.
|
|
int32_t first16bit = FirstNon8Bit(aBuffer, aBuffer + aLength);
|
|
|
|
if (first16bit != -1) { // aBuffer contains no non-8bit character
|
|
// The old data was 1-byte, but the new is not so we have to expand it
|
|
// all to 2-byte
|
|
char16_t* buff = (char16_t*)moz_malloc((mState.mLength + aLength) *
|
|
sizeof(char16_t));
|
|
if (!buff) {
|
|
return false;
|
|
}
|
|
|
|
// Copy data into buff
|
|
LossyConvertEncoding8to16 converter(buff);
|
|
copy_string(m1b, m1b+mState.mLength, converter);
|
|
|
|
memcpy(buff + mState.mLength, aBuffer, aLength * sizeof(char16_t));
|
|
mState.mLength += aLength;
|
|
mState.mIs2b = true;
|
|
|
|
if (mState.mInHeap) {
|
|
moz_free(m2b);
|
|
}
|
|
m2b = buff;
|
|
|
|
mState.mInHeap = true;
|
|
|
|
if (aUpdateBidi) {
|
|
UpdateBidiFlag(aBuffer + first16bit, aLength - first16bit);
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
// The new and the old data is all 1-byte
|
|
char* buff;
|
|
if (mState.mInHeap) {
|
|
buff = (char*)moz_realloc(const_cast<char*>(m1b),
|
|
(mState.mLength + aLength) * sizeof(char));
|
|
if (!buff) {
|
|
return false;
|
|
}
|
|
}
|
|
else {
|
|
buff = (char*)moz_malloc((mState.mLength + aLength) * sizeof(char));
|
|
if (!buff) {
|
|
return false;
|
|
}
|
|
|
|
memcpy(buff, m1b, mState.mLength);
|
|
mState.mInHeap = true;
|
|
}
|
|
|
|
// Copy aBuffer into buff.
|
|
LossyConvertEncoding16to8 converter(buff + mState.mLength);
|
|
copy_string(aBuffer, aBuffer + aLength, converter);
|
|
|
|
m1b = buff;
|
|
mState.mLength += aLength;
|
|
|
|
return true;
|
|
}
|
|
|
|
/* virtual */ size_t
|
|
nsTextFragment::SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const
|
|
{
|
|
if (Is2b()) {
|
|
return aMallocSizeOf(m2b);
|
|
}
|
|
|
|
if (mState.mInHeap) {
|
|
return aMallocSizeOf(m1b);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
// To save time we only do this when we really want to know, not during
|
|
// every allocation
|
|
void
|
|
nsTextFragment::UpdateBidiFlag(const char16_t* aBuffer, uint32_t aLength)
|
|
{
|
|
if (mState.mIs2b && !mState.mIsBidi) {
|
|
const char16_t* cp = aBuffer;
|
|
const char16_t* end = cp + aLength;
|
|
while (cp < end) {
|
|
char16_t ch1 = *cp++;
|
|
uint32_t utf32Char = ch1;
|
|
if (NS_IS_HIGH_SURROGATE(ch1) &&
|
|
cp < end &&
|
|
NS_IS_LOW_SURROGATE(*cp)) {
|
|
char16_t ch2 = *cp++;
|
|
utf32Char = SURROGATE_TO_UCS4(ch1, ch2);
|
|
}
|
|
if (UTF32_CHAR_IS_BIDI(utf32Char) || IsBidiControl(utf32Char)) {
|
|
mState.mIsBidi = true;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|