Title: [102341] trunk/Source/WebKit2
- Revision
- 102341
- Author
- hausm...@webkit.org
- Date
- 2011-12-08 08:06:52 -0800 (Thu, 08 Dec 2011)
Log Message
REGRESSION(r102334): Various Qt WK2 layout tests crash
Reviewed by Tor Arne Vestbø.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::editorState): Add missing null pointer check for the editable
element (scope) before calling innerText.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (102340 => 102341)
--- trunk/Source/WebKit2/ChangeLog 2011-12-08 15:46:47 UTC (rev 102340)
+++ trunk/Source/WebKit2/ChangeLog 2011-12-08 16:06:52 UTC (rev 102341)
@@ -1,5 +1,15 @@
2011-12-08 Simon Hausmann <simon.hausm...@nokia.com>
+ REGRESSION(r102334): Various Qt WK2 layout tests crash
+
+ Reviewed by Tor Arne Vestbø.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::editorState): Add missing null pointer check for the editable
+ element (scope) before calling innerText.
+
+2011-12-08 Simon Hausmann <simon.hausm...@nokia.com>
+
[Qt] WebKitTestRunner crashes with debug builds
https://bugs.webkit.org/show_bug.cgi?id=74090
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (102340 => 102341)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2011-12-08 15:46:47 UTC (rev 102340)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2011-12-08 16:06:52 UTC (rev 102341)
@@ -409,7 +409,7 @@
result.selectedText = range->text();
}
- if (result.isContentEditable && !result.isInPasswordField) {
+ if (scope && result.isContentEditable && !result.isInPasswordField) {
result.surroundingText = scope->innerText();
result.surroundingText.remove(result.compositionStart, result.compositionLength);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
