From fa2135e21851f63ad1c4dc54bd3222c3d642ca56 Mon Sep 17 00:00:00 2001 From: Szabolcs David Date: Wed, 10 Sep 2014 01:44:18 -0700 Subject: Fix toPlainText related crashes in QtRenderViewObserver Use the WebFrame's more reliable contentAsMarkup() and contentAsText() methods instead of going down to the Document element. Change-Id: I332e24375e074124099b59e8a784a0a038c6f70b Reviewed-by: Jocelyn Turcotte Reviewed-by: Andras Becsi --- src/core/renderer/qt_render_view_observer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/renderer') diff --git a/src/core/renderer/qt_render_view_observer.cpp b/src/core/renderer/qt_render_view_observer.cpp index 0986d31ef..d7dbee67d 100644 --- a/src/core/renderer/qt_render_view_observer.cpp +++ b/src/core/renderer/qt_render_view_observer.cpp @@ -54,7 +54,7 @@ void QtRenderViewObserver::onFetchDocumentMarkup(quint64 requestId) Send(new QtRenderViewObserverHost_DidFetchDocumentMarkup( routing_id(), requestId, - render_view()->GetWebView()->mainFrame()->document().createMarkup())); + render_view()->GetWebView()->mainFrame()->contentAsMarkup())); } void QtRenderViewObserver::onFetchDocumentInnerText(quint64 requestId) @@ -62,7 +62,7 @@ void QtRenderViewObserver::onFetchDocumentInnerText(quint64 requestId) Send(new QtRenderViewObserverHost_DidFetchDocumentInnerText( routing_id(), requestId, - render_view()->GetWebView()->mainFrame()->document().documentElement().innerText())); + render_view()->GetWebView()->mainFrame()->contentAsText(std::numeric_limits::max()))); } void QtRenderViewObserver::OnFirstVisuallyNonEmptyLayout() -- cgit v1.2.3