diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-18 14:03:11 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-18 14:03:11 +0200 |
commit | 8d473cf9743f1d30a16a27114e93bd5af5648d23 (patch) | |
tree | cdca40d0353886b3ca52f33a2d7b8f1c0011aafc /Source/WebKit/chromium/src/WebRange.cpp | |
parent | 1b914638db989aaa98631a1c1e02c7b2d44805d8 (diff) | |
download | qtwebkit-8d473cf9743f1d30a16a27114e93bd5af5648d23.tar.gz |
Imported WebKit commit 1350e72f7345ced9da2bd9980deeeb5a8d62fab4 (http://svn.webkit.org/repository/webkit/trunk@117578)
Weekly snapshot
Diffstat (limited to 'Source/WebKit/chromium/src/WebRange.cpp')
-rw-r--r-- | Source/WebKit/chromium/src/WebRange.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/WebKit/chromium/src/WebRange.cpp b/Source/WebKit/chromium/src/WebRange.cpp index be24dd793..85df0a3ba 100644 --- a/Source/WebKit/chromium/src/WebRange.cpp +++ b/Source/WebKit/chromium/src/WebRange.cpp @@ -32,9 +32,11 @@ #include "WebRange.h" #include "Document.h" +#include "Element.h" #include "Frame.h" #include "FrameView.h" #include "Range.h" +#include "ShadowRoot.h" #include "TextIterator.h" #include "WebFrameImpl.h" #include "WebNode.h" @@ -97,7 +99,7 @@ WebRange WebRange::fromDocumentRange(WebFrame* frame, int start, int length) { WebCore::Frame* webFrame = static_cast<WebFrameImpl*>(frame)->frame(); Element* selectionRoot = webFrame->selection()->rootEditableElement(); - Element* scope = selectionRoot ? selectionRoot : webFrame->document()->documentElement(); + ContainerNode* scope = selectionRoot ? selectionRoot : webFrame->document()->documentElement(); return TextIterator::rangeFromLocationAndLength(scope, start, length); } |