diff options
author | John Reck <jreck@google.com> | 2012-01-31 13:17:36 -0800 |
---|---|---|
committer | John Reck <jreck@google.com> | 2012-01-31 13:27:30 -0800 |
commit | 4b742e0b2c2d5e79a987688fd7d2cce5b0b24842 (patch) | |
tree | 2b74642142d3be70c73062cf6ab8d523fa7c3a1a /Source/WebKit/android/jni/WebViewCore.cpp | |
parent | dea0c131566f424923425970fe5621305d136e5a (diff) | |
download | external_webkit-4b742e0b2c2d5e79a987688fd7d2cce5b0b24842.zip external_webkit-4b742e0b2c2d5e79a987688fd7d2cce5b0b24842.tar.gz external_webkit-4b742e0b2c2d5e79a987688fd7d2cce5b0b24842.tar.bz2 |
Minor draw extras cleanup and refactor
Change-Id: Iba601e384549c11cf659a47e06c586048f624148
Diffstat (limited to 'Source/WebKit/android/jni/WebViewCore.cpp')
-rw-r--r-- | Source/WebKit/android/jni/WebViewCore.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp index cb08171..95b8dd6 100644 --- a/Source/WebKit/android/jni/WebViewCore.cpp +++ b/Source/WebKit/android/jni/WebViewCore.cpp @@ -1811,20 +1811,10 @@ SelectText* WebViewCore::createSelectText(const VisibleSelection& selection) int startOffset = node == startContainer ? range->startOffset() : 0; int endOffset = node == endContainer ? range->endOffset() : numeric_limits<int>::max(); LayerAndroid* layer = 0; - int layerId = platformLayerIdFromNode(node, &layer); - SkRegion* region = selectTextContainer->getHightlightRegionsForLayer(layerId); - bool needsSet = false; - if (!region) - selectTextContainer->setHighlightRegionsForLayer(layerId, region = new SkRegion()); + platformLayerIdFromNode(node, &layer); Vector<IntRect> rects; renderText->absoluteRectsForRange(rects, startOffset, endOffset, true); - IntPoint offset; - layerToAbsoluteOffset(layer, offset); - for (size_t i = 0; i < rects.size(); i++) { - IntRect& r = rects.at(i); - r.move(-offset.x(), -offset.y()); - region->op(r.x(), r.y(), r.maxX(), r.maxY(), SkRegion::kUnion_Op); - } + selectTextContainer->addHighlightRegion(layer, rects); } IntRect caretRect; |