Merge 66911 - 2010-09-07 Abhishek Arya <inferno@chromium.org>...

WebCore/rendering/RenderTextFragment.cpp

 /*
  * (C) 1999 Lars Knoll (knoll@kde.org)
  * (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007 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 30 matching lines @@
     , m_end(str ? str->length() : 0)
     , m_contentString(str)
     , m_firstLetter(0)
 {
 }
 
 PassRefPtr<StringImpl> RenderTextFragment::originalText() const
 {
     Node* e = node();
     RefPtr<StringImpl> result = ((e && e->isTextNode()) ? static_cast<Text*>(e)->dataImpl() : contentString());
-    if (result && (start() > 0 || start() < result->length()))
-        result = result->substring(start(), end());
-    return result.release();
+    if (!result)
+        return 0;
+    return result->substring(start(), end());
 }
 
 void RenderTextFragment::destroy()
 {
     if (m_firstLetter)
         m_firstLetter->destroy();
     RenderText::destroy();
 }
 
 void RenderTextFragment::setTextInternal(PassRefPtr<StringImpl> text)
@@ skipping 10 matching lines @@
             t->setRenderer(this);
         }
     }
 }
 
 UChar RenderTextFragment::previousCharacter() const
 {
     if (start()) {
         Node* e = node();
         StringImpl*  original = ((e && e->isTextNode()) ? static_cast<Text*>(e)->dataImpl() : contentString());
-        if (original)
+        if (original && start() <= original->length())
             return (*original)[start() - 1];
     }
 
     return RenderText::previousCharacter();
 }
 
 } // namespace WebCore