DO NOT SUBMIT

Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp

Index: Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
index b95428359133780b4ced60bf63d95a36b9de150c..fc2b3f2350c9e9771f815bdf923926ab43f6894e 100644
--- a/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
@@ -196,7 +196,9 @@ void WebEditorClient::respondToChangedSelection()
     selectionState.isInPasswordField = frame->selection()->isInPasswordField();
     selectionState.hasComposition = frame->editor()->hasComposition();
 
-    WebPage::getLocationAndLengthFromRange(frame->selection()->toNormalizedRange().get(), selectionState.selectedRangeStart, selectionState.selectedRangeLength);
+    Range* range = frame->selection()->toNormalizedRange().get();
+    if (range)
+        range->getLocationAndLength(selectionState.selectedRangeStart, selectionState.selectedRangeLength);
 
     m_page->send(Messages::WebPageProxy::SelectionStateChanged(selectionState));