DO NOT SUBMIT

Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp

 /*
  * Copyright (C) 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 178 matching lines @@
     if (!frame)
         return;
 
     SelectionState selectionState;
     selectionState.isNone = frame->selection()->isNone();
     selectionState.isContentEditable = frame->selection()->isContentEditable();
     selectionState.isContentRichlyEditable = frame->selection()->isContentRichlyEditable();
     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));
 
 #if PLATFORM(WIN)
     // FIXME: This should also go into the selection state.
     if (!frame->editor()->hasComposition() || frame->editor()->ignoreCompositionSelectionChange())
         return;
 
     unsigned start;
     unsigned end;
@@ skipping 230 matching lines @@
 {
     notImplemented();
 }
 
 void WebEditorClient::requestCheckingOfString(WebCore::SpellChecker*, int, const WTF::String&)
 {
     notImplemented();
 }
 
 } // namespace WebKit