Title: [104040] trunk/Source/WebKit2
- Revision
- 104040
- Author
- [email protected]
- Date
- 2012-01-04 07:55:23 -0800 (Wed, 04 Jan 2012)
Log Message
[Qt] Fix test regressions after r104025
https://bugs.webkit.org/show_bug.cgi?id=75545
Patch by Alexander Færøy <[email protected]> on 2012-01-04
Reviewed by Kenneth Rohde Christiansen.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::editorState):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (104039 => 104040)
--- trunk/Source/WebKit2/ChangeLog 2012-01-04 15:41:37 UTC (rev 104039)
+++ trunk/Source/WebKit2/ChangeLog 2012-01-04 15:55:23 UTC (rev 104040)
@@ -1,3 +1,13 @@
+2012-01-04 Alexander Færøy <[email protected]>
+
+ [Qt] Fix test regressions after r104025
+ https://bugs.webkit.org/show_bug.cgi?id=75545
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::editorState):
+
2012-01-04 Andras Becsi <[email protected]>
REGRESSION(r104028): Broke editing tests and event coordinates in desktop behaviour
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (104039 => 104040)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-01-04 15:41:37 UTC (rev 104039)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-01-04 15:55:23 UTC (rev 104040)
@@ -386,6 +386,7 @@
result.isContentRichlyEditable = frame->selection()->isContentRichlyEditable();
result.isInPasswordField = frame->selection()->isInPasswordField();
result.hasComposition = frame->editor()->hasComposition();
+ result.shouldIgnoreCompositionSelectionChange = frame->editor()->ignoreCompositionSelectionChange();
#if PLATFORM(QT)
size_t location = 0;
@@ -394,6 +395,9 @@
Element* selectionRoot = frame->selection()->rootEditableElement();
Element* scope = selectionRoot ? selectionRoot : frame->document()->documentElement();
+ if (!scope)
+ return result;
+
RefPtr<Range> range;
if (result.hasComposition && (range = frame->editor()->compositionRange())) {
frame->editor()->getCompositionSelection(result.anchorPosition, result.cursorPosition);
@@ -423,8 +427,6 @@
}
#endif
- result.shouldIgnoreCompositionSelectionChange = frame->editor()->ignoreCompositionSelectionChange();
-
return result;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
