summaryrefslogtreecommitdiff
path: root/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-05-07 11:21:11 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-05-07 11:21:11 +0200
commit2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (patch)
tree988e8c5b116dd0466244ae2fe5af8ee9be926d76 /Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp
parentdd91e772430dc294e3bf478c119ef8d43c0a3358 (diff)
downloadqtwebkit-2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47.tar.gz
Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)
Diffstat (limited to 'Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp')
-rw-r--r--Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp b/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp
index cebbb30c1..0c4295e61 100644
--- a/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp
+++ b/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp
@@ -67,12 +67,12 @@ PassRefPtr<InjectedBundleNodeHandle> InjectedBundleNodeHandle::getOrCreate(Node*
if (!node)
return 0;
- std::pair<DOMHandleCache::iterator, bool> result = domHandleCache().add(node, 0);
- if (!result.second)
- return PassRefPtr<InjectedBundleNodeHandle>(result.first->second);
+ DOMHandleCache::AddResult result = domHandleCache().add(node, 0);
+ if (!result.isNewEntry)
+ return PassRefPtr<InjectedBundleNodeHandle>(result.iterator->second);
RefPtr<InjectedBundleNodeHandle> nodeHandle = InjectedBundleNodeHandle::create(node);
- result.first->second = nodeHandle.get();
+ result.iterator->second = nodeHandle.get();
return nodeHandle.release();
}
@@ -114,7 +114,7 @@ IntRect InjectedBundleNodeHandle::elementBounds() const
IntRect InjectedBundleNodeHandle::renderRect(bool* isReplaced) const
{
- return m_node.get()->renderRect(isReplaced);
+ return m_node.get()->pixelSnappedRenderRect(isReplaced);
}
void InjectedBundleNodeHandle::setHTMLInputElementValueForUser(const String& value)