Merge to XFA: CFX_ByteString/WideString header changes

core/src/fxcrt/fx_basic_wstring.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include <stddef.h>  // For offsetof().
+
 #include "../../include/fxcrt/fx_basic.h"
 #include "../../../third_party/base/numerics/safe_math.h"
 
 static CFX_StringDataW* FX_AllocStringW(int nLen)
 {
     // TODO(palmer): |nLen| should really be declared as |size_t|, or
     // at least unsigned.
     if (nLen == 0 || nLen < 0) {
         return NULL;
     }
 
-    int overhead = 3 * sizeof(long) + sizeof(FX_WCHAR);  // +WCHAR is for NUL.
+    // Fixed portion of header plus a NUL wide char not in m_nAllocLength.
+    int overhead = offsetof(CFX_StringDataW, m_String) + sizeof(FX_WCHAR);
     pdfium::base::CheckedNumeric<int> iSize = nLen;
     iSize *= sizeof(FX_WCHAR);
     iSize += overhead;
 
     // Now round to an 8-byte boundary. We'd expect that this is the minimum
     // granularity of any of the underlying allocators, so there may be cases
     // where we can save a re-alloc when adding a few characters to a string
     // by using this otherwise wasted space.
     iSize += 7;
     int totalSize = iSize.ValueOrDie() & ~7;
@@ skipping 1087 matching lines @@
             return (CFX_CharMap*)&g_DefaultJISMapper;
         case 936:
             return (CFX_CharMap*)&g_DefaultGBKMapper;
         case 949:
             return (CFX_CharMap*)&g_DefaultUHCMapper;
         case 950:
             return (CFX_CharMap*)&g_DefaultBig5Mapper;
     }
     return NULL;
 }