From 0f5d4355d7a384679722338d55f65bbb92350cfc Mon Sep 17 00:00:00 2001
From: Naiem Shaik <snaiem@codeaurora.org>
Date: Thu, 19 Jul 2012 10:45:56 -0700
Subject: DOM Optimizations

DOM traversal optimizations
DOM Core optimizations
Prefetch optimization for DOM Tree Traversal

Conflicts:

	Source/WebKit/android/jni/WebViewCore.cpp

Change-Id: Icbb8a7229ee9cff1a5401b57c8181f18b9a6d6e0
---
 Source/WebCore/dom/Text.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Source/WebCore/dom/Text.cpp')

diff --git a/Source/WebCore/dom/Text.cpp b/Source/WebCore/dom/Text.cpp
index c4ea0a6..01a454d 100644
--- a/Source/WebCore/dom/Text.cpp
+++ b/Source/WebCore/dom/Text.cpp
@@ -213,7 +213,7 @@ bool Text::rendererIsNeeded(RenderStyle *style)
     if (style->preserveNewline()) // pre/pre-wrap/pre-line always make renderers.
         return true;
     
-    RenderObject *prev = previousRenderer();
+    RenderObject* prev = m_previousRenderer ? m_previousRenderer : previousRenderer();
     if (prev && prev->isBR()) // <span><br/> <br/></span>
         return false;
         
-- 
cgit v1.1