summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/android/context
diff options
context:
space:
mode:
authorNicolas Roard <nicolasroard@google.com>2012-07-18 20:16:00 -0700
committerNicolas Roard <nicolasroard@google.com>2012-07-18 20:29:09 -0700
commiteb8e22896b89fd99a56a0e70888838ca22a558cf (patch)
treeb9bc63cec93ddf29b1a0a2749f60d7fc22bd2039 /Source/WebCore/platform/graphics/android/context
parent8382c7e683ecb739add98681f8d1674ad063459d (diff)
downloadexternal_webkit-eb8e22896b89fd99a56a0e70888838ca22a558cf.zip
external_webkit-eb8e22896b89fd99a56a0e70888838ca22a558cf.tar.gz
external_webkit-eb8e22896b89fd99a56a0e70888838ca22a558cf.tar.bz2
Fix issues with bounds computation
Change-Id: I1a956939c35ab37a2195a5589276589301c97da9
Diffstat (limited to 'Source/WebCore/platform/graphics/android/context')
-rw-r--r--Source/WebCore/platform/graphics/android/context/RTree.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/context/RTree.cpp b/Source/WebCore/platform/graphics/android/context/RTree.cpp
index fef30b3..69ecf29 100644
--- a/Source/WebCore/platform/graphics/android/context/RTree.cpp
+++ b/Source/WebCore/platform/graphics/android/context/RTree.cpp
@@ -318,8 +318,10 @@ void Node::add(Node* node)
Node* NN = 0;
if (m_nbChildren > m_tree->m_maxChildren)
NN = split();
+ else
+ tighten();
+
adjustTree(this, NN);
- tighten();
}
void Node::remove(Node* node)
@@ -462,6 +464,9 @@ void Node::adjustTree(Node* N, Node* NN)
if (N->isRoot())
return;
+ if (N->m_parent)
+ N->m_parent->tighten();
+
if (NN && N->m_parent)
N->m_parent->add(NN);
}