Changeset 17647 in webkit

Timestamp:

Nov 7, 2006 2:24:28 PM (17 years ago)

Author:

bdakin

Message:

Reviewed by Hyatt (yesterday).

Here is part of my patch from yesterday that is safe to roll back
in. It will make the BuildBot happy.

• rendering/HitTestResult.cpp: (WebCore::HitTestResult::spellingToolTip): Null-check m_innerNonSharedNode.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/HitTestResult.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-11-07  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Hyatt (yesterday).
+
+        Here is part of my patch from yesterday that is safe to roll back 
+        in. It will make the BuildBot happy.
+
+        * rendering/HitTestResult.cpp:
+        (WebCore::HitTestResult::spellingToolTip): Null-check 
+        m_innerNonSharedNode.
+
 2006-11-07  Darin Adler  <darin@apple.com>
 

trunk/WebCore/rendering/HitTestResult.cpp

@@ -130 +130 @@
     // Return the tool tip string associated with this point, if any. Only markers associated with bad grammar
     // currently supply strings, but maybe someday markers associated with misspelled words will also.
-    DocumentMarker* marker = m_innerNonSharedNode->document()->markerContainingPoint(m_point, DocumentMarker::Grammar);
-    if (marker)
-        return marker->description;
-    
-    return String();
+    if (!m_innerNonSharedNode)
+        return String();
+    
+     DocumentMarker* marker = m_innerNonSharedNode->document()->markerContainingPoint(m_point, DocumentMarker::Grammar);
+    if (!marker)
+        return String();
+
+    return marker->description;
 }