Changeset 142093 in webkit

Timestamp:

Feb 7, 2013 4:18:12 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Add null check to editable in moveCaretSelectionTowardsWindowPoint
​https://bugs.webkit.org/show_bug.cgi?id=108962

Patch by David Trainor <​dtrainor@chromium.org> on 2013-02-07
Reviewed by Eric Seidel.

• src/WebFrameImpl.cpp:

(WebKit::WebFrameImpl::moveCaretSelectionTowardsWindowPoint):

• tests/WebFrameTest.cpp:

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/WebFrameImpl.cpp (modified) (1 diff)
• tests/WebFrameTest.cpp (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2013-02-07  David Trainor  <dtrainor@chromium.org>
+
+        Add null check to editable in moveCaretSelectionTowardsWindowPoint
+        https://bugs.webkit.org/show_bug.cgi?id=108962
+
+        Reviewed by Eric Seidel.
+
+        * src/WebFrameImpl.cpp:
+        (WebKit::WebFrameImpl::moveCaretSelectionTowardsWindowPoint):
+        * tests/WebFrameTest.cpp:
+
 2013-02-07  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp

@@ -1413 +1413 @@
 
     Element* editable = frame()->selection()->rootEditableElement();
+    if (!editable)
+        return;
+
     IntPoint contentsPoint = frame()->view()->windowToContents(unscaledPoint);
     LayoutPoint localPoint(editable->convertFromPage(contentsPoint));

trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp

@@ -2181 +2181 @@
 }
 
+TEST_F(WebFrameTest, MoveCaretSelectionTowardsWindowPointWithNoSelection)
+{
+    WebView* webView = FrameTestHelpers::createWebViewAndLoad("about:blank", true);
+    WebFrame* frame = webView->mainFrame();
+
+    // This test passes if this doesn't crash.
+    frame->moveCaretSelectionTowardsWindowPoint(WebPoint(0, 0));
+}
+
 } // namespace