Have codePointAt DCHECKS apply to 8bit strings too

third_party/WebKit/Source/platform/text/TextRun.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2006, 2007, 2011 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 165 matching lines @@
   const LChar* characters8() const {
     ASSERT(is8Bit());
     return m_data.characters8;
   }
   const UChar* characters16() const {
     ASSERT(!is8Bit());
     return m_data.characters16;
   }
 
   UChar32 codepointAt(unsigned i) const {
+    SECURITY_DCHECK(i < m_len);
     if (is8Bit())
       return (*this)[i];
     UChar32 codepoint;
-    SECURITY_DCHECK(i < m_len);
     U16_GET(characters16(), 0, i, m_len, codepoint);
     return codepoint;
   }
 
   UChar32 codepointAtAndNext(unsigned& i) const {
+    SECURITY_DCHECK(i < m_len);
     if (is8Bit())
       return (*this)[i++];
     UChar32 codepoint;
-    SECURITY_DCHECK(i < m_len);
     U16_NEXT(characters16(), i, m_len, codepoint);
     return codepoint;
   }
 
   bool is8Bit() const { return m_is8Bit; }
   unsigned length() const { return m_len; }
   unsigned charactersLength() const { return m_charactersLength; }
 
   bool normalizeSpace() const { return m_normalizeSpace; }
   void setNormalizeSpace(bool normalizeSpace) {
@@ skipping 109 matching lines @@
 
   const TextRun& run;
   unsigned from;
   unsigned to;
   FloatRect bounds;
   sk_sp<SkTextBlob>* cachedTextBlob;
 };
 
 }  // namespace blink
 #endif