Changeset 167160 in webkit

Timestamp:

Apr 11, 2014 3:13:46 PM (10 years ago)

Author:

ddkilzer@apple.com

Message:

Build fix (r167151): Do not dereference Node::document() before passing to Range::create()
<​https://webkit.org/b/131475>

Fixes the following build failure:

WebCore/editing/AlternativeTextController.cpp:275:71: error: indirection requires pointer operand ('WebCore::Document' invalid)

int paragraphStartIndex = TextIterator::rangeLength(Range::create(*rootNode.document(), &rootNode, 0, paragraphRangeContainingCorrection.get()->startContainer(), paragraphRangeContainingCorrection.get()->startOffset()).get());

^~

• editing/AlternativeTextController.cpp:

(WebCore::AlternativeTextController::applyAlternativeTextToRange):
Remove unneeded '*' operator since Node::document() returns a
Document& and Range::create() accepts a Document& for its first
argument.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/AlternativeTextController.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-11  David Kilzer  <ddkilzer@apple.com>
+
+        Build fix (r167151): Do not dereference Node::document() before passing to Range::create()
+        <https://webkit.org/b/131475>
+
+        Fixes the following build failure:
+
+            WebCore/editing/AlternativeTextController.cpp:275:71: error: indirection requires pointer operand ('WebCore::Document' invalid)
+                int paragraphStartIndex = TextIterator::rangeLength(Range::create(*rootNode.document(), &rootNode, 0, paragraphRangeContainingCorrection.get()->startContainer(), paragraphRangeContainingCorrection.get()->startOffset()).get());
+                                                                                  ^~~~~~~~~~~~~~~~~~~~
+
+        * editing/AlternativeTextController.cpp:
+        (WebCore::AlternativeTextController::applyAlternativeTextToRange):
+        Remove unneeded '*' operator since Node::document() returns a
+        Document& and Range::create() accepts a Document& for its first
+        argument.
+
 2014-04-11  Brian J. Burg  <burg@cs.washington.edu>
 

trunk/Source/WebCore/editing/AlternativeTextController.cpp

@@ -273 +273 @@
 
     ContainerNode& rootNode = paragraphRangeContainingCorrection.get()->startContainer()->treeScope().rootNode();
-    int paragraphStartIndex = TextIterator::rangeLength(Range::create(*rootNode.document(), &rootNode, 0, paragraphRangeContainingCorrection.get()->startContainer(), paragraphRangeContainingCorrection.get()->startOffset()).get());
+    int paragraphStartIndex = TextIterator::rangeLength(Range::create(rootNode.document(), &rootNode, 0, paragraphRangeContainingCorrection.get()->startContainer(), paragraphRangeContainingCorrection.get()->startOffset()).get());
     applyCommand(SpellingCorrectionCommand::create(rangeWithAlternative, alternative));
     // Recalculate pragraphRangeContainingCorrection, since SpellingCorrectionCommand modified the DOM, such that the original paragraphRangeContainingCorrection is no longer valid. Radar: 10305315 Bugzilla: 89526