diff options
author | Konstantin Tokarev <annulen@yandex.ru> | 2018-01-07 19:43:21 +0300 |
---|---|---|
committer | Konstantin Tokarev <annulen@yandex.ru> | 2018-01-07 17:08:48 +0000 |
commit | cb895f50d5c08976c0f5ecbb82e6bd19d9ea090d (patch) | |
tree | fd8632d48c2ee72747feaa0e2b458d591e254288 /Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp | |
parent | 8cab1238d6ea14fa6a61ed4e0c5d39ccd0736ec2 (diff) | |
download | qtwebkit-cb895f50d5c08976c0f5ecbb82e6bd19d9ea090d.tar.gz |
Import WebKit commit 69d327017a8d700cbfc7e1120270db4d55416f41
Change-Id: I38406c67ba681f7693a45b0fa2d8c2e44a6d9a0e
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp')
-rw-r--r-- | Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp b/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp index 89e872fb2..00dc0c488 100644 --- a/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp +++ b/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp @@ -390,7 +390,10 @@ QString QWebPageAdapter::selectedText() const QString QWebPageAdapter::selectedHtml() const { - return page->focusController().focusedOrMainFrame().editor().selectedRange()->toHTML(); + RefPtr<Range> range = page->focusController().focusedOrMainFrame().editor().selectedRange(); + if (!range) + return QString(); + return range->toHTML(); } bool QWebPageAdapter::isContentEditable() const |