<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[174888] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/174888">174888</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2014-10-20 10:03:26 -0700 (Mon, 20 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix the iOS build.
Source/WebCore:
* WebCore.xcodeproj/project.pbxproj:
* dom/RenderedDocumentMarker.h:
* page/ios/FrameIOS.mm:
(WebCore::Frame::interpretationsForCurrentRoot):
Source/WebKit/ios:
* WebCoreSupport/WebFrameIOS.mm:
(-[WebFrame previousUnperturbedDictationResultBoundaryFromPosition:]):
(-[WebFrame nextUnperturbedDictationResultBoundaryFromPosition:]):
* WebCoreSupport/WebVisiblePosition.mm:
(-[WebVisiblePosition enclosingRangeWithDictationPhraseAlternatives:]):
(-[WebVisiblePosition enclosingRangeWithCorrectionIndicator]):
Source/WebKit/mac:
* WebView/WebFrame.mm:
(-[WebFrame getDictationResultRanges:andMetadatas:]):
(-[WebFrame dictationResultMetadataForRange:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoredomRenderedDocumentMarkerh">trunk/Source/WebCore/dom/RenderedDocumentMarker.h</a></li>
<li><a href="#trunkSourceWebCorepageiosFrameIOSmm">trunk/Source/WebCore/page/ios/FrameIOS.mm</a></li>
<li><a href="#trunkSourceWebKitiosChangeLog">trunk/Source/WebKit/ios/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitiosWebCoreSupportWebFrameIOSmm">trunk/Source/WebKit/ios/WebCoreSupport/WebFrameIOS.mm</a></li>
<li><a href="#trunkSourceWebKitiosWebCoreSupportWebVisiblePositionmm">trunk/Source/WebKit/ios/WebCoreSupport/WebVisiblePosition.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFramemm">trunk/Source/WebKit/mac/WebView/WebFrame.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174887 => 174888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-20 17:03:21 UTC (rev 174887)
+++ trunk/Source/WebCore/ChangeLog 2014-10-20 17:03:26 UTC (rev 174888)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-10-20 Andy Estes <aestes@apple.com>
+
+ Fix the iOS build.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * dom/RenderedDocumentMarker.h:
+ * page/ios/FrameIOS.mm:
+ (WebCore::Frame::interpretationsForCurrentRoot):
+
</ins><span class="cx"> 2014-10-20 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> Update the <link>'s link status
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (174887 => 174888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-10-20 17:03:21 UTC (rev 174887)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-10-20 17:03:26 UTC (rev 174888)
</span><span class="lines">@@ -3842,7 +3842,7 @@
</span><span class="cx"> A75E8B8E0E1DE2D6007F2481 /* FEComposite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A75E8B860E1DE2D6007F2481 /* FEComposite.cpp */; };
</span><span class="cx"> A75E8B8F0E1DE2D6007F2481 /* FEComposite.h in Headers */ = {isa = PBXBuildFile; fileRef = A75E8B870E1DE2D6007F2481 /* FEComposite.h */; };
</span><span class="cx"> A769E96A16689D0C005D4529 /* UserActionElementSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A769E96916689D0C005D4529 /* UserActionElementSet.cpp */; };
</span><del>- A76E5F7F135E0DCF00A69837 /* RenderedDocumentMarker.h in Headers */ = {isa = PBXBuildFile; fileRef = A76E5F7E135E0DCF00A69837 /* RenderedDocumentMarker.h */; };
</del><ins>+ A76E5F7F135E0DCF00A69837 /* RenderedDocumentMarker.h in Headers */ = {isa = PBXBuildFile; fileRef = A76E5F7E135E0DCF00A69837 /* RenderedDocumentMarker.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> A77979190D6B9D0C003851B9 /* ImageData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A77979130D6B9D0C003851B9 /* ImageData.cpp */; };
</span><span class="cx"> A779791A0D6B9D0C003851B9 /* ImageData.h in Headers */ = {isa = PBXBuildFile; fileRef = A77979140D6B9D0C003851B9 /* ImageData.h */; };
</span><span class="cx"> A77979280D6B9E64003851B9 /* JSImageData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A77979240D6B9E64003851B9 /* JSImageData.cpp */; };
</span></span></pre></div>
<a id="trunkSourceWebCoredomRenderedDocumentMarkerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/RenderedDocumentMarker.h (174887 => 174888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/RenderedDocumentMarker.h 2014-10-20 17:03:21 UTC (rev 174887)
+++ trunk/Source/WebCore/dom/RenderedDocumentMarker.h 2014-10-20 17:03:26 UTC (rev 174888)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #ifndef RenderedDocumentMarker_h
</span><span class="cx"> #define RenderedDocumentMarker_h
</span><span class="cx">
</span><del>-#include "DocumentMarker.h"
</del><ins>+#include <WebCore/DocumentMarker.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageiosFrameIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ios/FrameIOS.mm (174887 => 174888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ios/FrameIOS.mm 2014-10-20 17:03:21 UTC (rev 174887)
+++ trunk/Source/WebCore/page/ios/FrameIOS.mm 2014-10-20 17:03:26 UTC (rev 174888)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> #import "DOMNodeInternal.h"
</span><span class="cx"> #import "DOMWindow.h"
</span><span class="cx"> #import "Document.h"
</span><del>-#import "DocumentMarker.h"
</del><span class="cx"> #import "DocumentMarkerController.h"
</span><span class="cx"> #import "Editor.h"
</span><span class="cx"> #import "EditorClient.h"
</span><span class="lines">@@ -63,6 +62,7 @@
</span><span class="cx"> #import "RenderLayerCompositor.h"
</span><span class="cx"> #import "RenderTextControl.h"
</span><span class="cx"> #import "RenderView.h"
</span><ins>+#import "RenderedDocumentMarker.h"
</ins><span class="cx"> #import "TextBoundaries.h"
</span><span class="cx"> #import "TextIterator.h"
</span><span class="cx"> #import "VisiblePosition.h"
</span><span class="lines">@@ -748,7 +748,7 @@
</span><span class="cx"> unsigned rootChildCount = root->countChildNodes();
</span><span class="cx"> RefPtr<Range> rangeOfRootContents = Range::create(*document(), createLegacyEditingPosition(root, 0), createLegacyEditingPosition(root, rootChildCount));
</span><span class="cx">
</span><del>- Vector<DocumentMarker*> markersInRoot = document()->markers().markersInRange(rangeOfRootContents.get(), DocumentMarker::DictationPhraseWithAlternatives);
</del><ins>+ auto markersInRoot = document()->markers().markersInRange(rangeOfRootContents.get(), DocumentMarker::DictationPhraseWithAlternatives);
</ins><span class="cx">
</span><span class="cx"> // There are no phrases with alternatives, so there is just one interpretation.
</span><span class="cx"> if (markersInRoot.isEmpty())
</span></span></pre></div>
<a id="trunkSourceWebKitiosChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/ChangeLog (174887 => 174888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/ChangeLog 2014-10-20 17:03:21 UTC (rev 174887)
+++ trunk/Source/WebKit/ios/ChangeLog 2014-10-20 17:03:26 UTC (rev 174888)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-10-20 Andy Estes <aestes@apple.com>
+
+ Fix the iOS build.
+
+ * WebCoreSupport/WebFrameIOS.mm:
+ (-[WebFrame previousUnperturbedDictationResultBoundaryFromPosition:]):
+ (-[WebFrame nextUnperturbedDictationResultBoundaryFromPosition:]):
+ * WebCoreSupport/WebVisiblePosition.mm:
+ (-[WebVisiblePosition enclosingRangeWithDictationPhraseAlternatives:]):
+ (-[WebVisiblePosition enclosingRangeWithCorrectionIndicator]):
+
</ins><span class="cx"> 2014-10-15 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Use is<>() / downcast<>() for RenderTextControl / RenderTextControlSingleLine
</span></span></pre></div>
<a id="trunkSourceWebKitiosWebCoreSupportWebFrameIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/WebCoreSupport/WebFrameIOS.mm (174887 => 174888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/WebCoreSupport/WebFrameIOS.mm 2014-10-20 17:03:21 UTC (rev 174887)
+++ trunk/Source/WebKit/ios/WebCoreSupport/WebFrameIOS.mm 2014-10-20 17:03:26 UTC (rev 174888)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> #import <WebCore/Range.h>
</span><span class="cx"> #import <WebCore/RenderObject.h>
</span><span class="cx"> #import <WebCore/RenderText.h>
</span><ins>+#import <WebCore/RenderedDocumentMarker.h>
</ins><span class="cx"> #import <WebCore/SelectionRect.h>
</span><span class="cx"> #import <WebCore/TextBoundaries.h>
</span><span class="cx"> #import <WebCore/TextDirection.h>
</span><span class="lines">@@ -859,7 +860,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<Range> graphemeRange = Range::create(document, previousVisiblePosition.deepEquivalent(), currentVisiblePosition.deepEquivalent());
</span><span class="cx">
</span><del>- Vector<DocumentMarker*> markers = document.markers().markersInRange(graphemeRange.get(), DocumentMarker::DictationResult);
</del><ins>+ auto markers = document.markers().markersInRange(graphemeRange.get(), DocumentMarker::DictationResult);
</ins><span class="cx"> if (markers.isEmpty())
</span><span class="cx"> return currentWebVisiblePosition;
</span><span class="cx">
</span><span class="lines">@@ -868,7 +869,7 @@
</span><span class="cx"> // ASSERT(markers.size() == 1);
</span><span class="cx"> if (markers.size() > 1)
</span><span class="cx"> return currentWebVisiblePosition;
</span><del>- DocumentMarker* resultMarker = markers.at(0);
</del><ins>+ RenderedDocumentMarker* resultMarker = markers.at(0);
</ins><span class="cx">
</span><span class="cx"> // FIXME: WebCore doesn't always update markers correctly during editing. Bail if resultMarker extends off the edge of
</span><span class="cx"> // this node, because that means it's invalid.
</span><span class="lines">@@ -915,7 +916,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<Range> graphemeRange = Range::create(document, currentVisiblePosition.deepEquivalent(), nextVisiblePosition.deepEquivalent());
</span><span class="cx">
</span><del>- Vector<DocumentMarker*> markers = document.markers().markersInRange(graphemeRange.get(), DocumentMarker::DictationResult);
</del><ins>+ auto markers = document.markers().markersInRange(graphemeRange.get(), DocumentMarker::DictationResult);
</ins><span class="cx"> if (markers.isEmpty())
</span><span class="cx"> return currentWebVisiblePosition;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitiosWebCoreSupportWebVisiblePositionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/WebCoreSupport/WebVisiblePosition.mm (174887 => 174888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/WebCoreSupport/WebVisiblePosition.mm 2014-10-20 17:03:21 UTC (rev 174887)
+++ trunk/Source/WebKit/ios/WebCoreSupport/WebVisiblePosition.mm 2014-10-20 17:03:26 UTC (rev 174888)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #import <WebCore/Position.h>
</span><span class="cx"> #import <WebCore/Range.h>
</span><span class="cx"> #import <WebCore/RenderTextControl.h>
</span><ins>+#import <WebCore/RenderedDocumentMarker.h>
</ins><span class="cx"> #import <WebCore/TextBoundaries.h>
</span><span class="cx"> #import <WebCore/TextDirection.h>
</span><span class="cx"> #import <WebCore/TextGranularity.h>
</span><span class="lines">@@ -422,7 +423,7 @@
</span><span class="cx"> Node* node = p.deepEquivalent().anchorNode();
</span><span class="cx"> Document& document = node->document();
</span><span class="cx">
</span><del>- const Vector<DocumentMarker*>& markers = document.markers().markersFor(node, DocumentMarker::MarkerTypes(DocumentMarker::DictationPhraseWithAlternatives));
</del><ins>+ const auto& markers = document.markers().markersFor(node, DocumentMarker::MarkerTypes(DocumentMarker::DictationPhraseWithAlternatives));
</ins><span class="cx"> if (markers.isEmpty())
</span><span class="cx"> return nil;
</span><span class="cx">
</span><span class="lines">@@ -456,7 +457,7 @@
</span><span class="cx"> Node* node = p.deepEquivalent().anchorNode();
</span><span class="cx"> Document& document = node->document();
</span><span class="cx">
</span><del>- const Vector<DocumentMarker*>& markers = document.markers().markersFor(node, DocumentMarker::MarkerTypes(DocumentMarker::Spelling));
</del><ins>+ const auto& markers = document.markers().markersFor(node, DocumentMarker::MarkerTypes(DocumentMarker::Spelling));
</ins><span class="cx"> if (markers.isEmpty())
</span><span class="cx"> return nil;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (174887 => 174888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-10-20 17:03:21 UTC (rev 174887)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-10-20 17:03:26 UTC (rev 174888)
</span><span class="lines">@@ -1,3 +1,11 @@
</span><ins>+2014-10-20 Andy Estes <aestes@apple.com>
+
+ Fix the iOS build.
+
+ * WebView/WebFrame.mm:
+ (-[WebFrame getDictationResultRanges:andMetadatas:]):
+ (-[WebFrame dictationResultMetadataForRange:]):
+
</ins><span class="cx"> 2014-10-19 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Use is<>() / downcast<>() for all remaining RenderObject subclasses
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFramemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (174887 => 174888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2014-10-20 17:03:21 UTC (rev 174887)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2014-10-20 17:03:26 UTC (rev 174888)
</span><span class="lines">@@ -87,6 +87,7 @@
</span><span class="cx"> #import <WebCore/PrintContext.h>
</span><span class="cx"> #import <WebCore/RenderView.h>
</span><span class="cx"> #import <WebCore/RenderWidget.h>
</span><ins>+#import <WebCore/RenderedDocumentMarker.h>
</ins><span class="cx"> #import <WebCore/RuntimeApplicationChecks.h>
</span><span class="cx"> #import <WebCore/ScriptController.h>
</span><span class="cx"> #import <WebCore/SecurityOrigin.h>
</span><span class="lines">@@ -1763,14 +1764,12 @@
</span><span class="cx"> id previousMetadata = nil;
</span><span class="cx">
</span><span class="cx"> for (Node* node = root; node; node = NodeTraversal::next(node)) {
</span><del>- Vector<DocumentMarker*> markers = document->markers().markersFor(node);
- Vector<DocumentMarker*>::const_iterator end = markers.end();
- for (Vector<DocumentMarker*>::const_iterator it = markers.begin(); it != end; ++it) {
-
- if ((*it)->type() != DocumentMarker::DictationResult)
</del><ins>+ auto markers = document->markers().markersFor(node);
+ for (auto marker : markers) {
+
+ if (marker->type() != DocumentMarker::DictationResult)
</ins><span class="cx"> continue;
</span><span class="cx">
</span><del>- const DocumentMarker* marker = *it;
</del><span class="cx"> id metadata = marker->metadata();
</span><span class="cx">
</span><span class="cx"> // All result markers should have metadata.
</span><span class="lines">@@ -1812,7 +1811,7 @@
</span><span class="cx"> if (!range)
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- Vector<DocumentMarker*> markers = core(self)->document()->markers().markersInRange(core(range), DocumentMarker::DictationResult);
</del><ins>+ auto markers = core(self)->document()->markers().markersInRange(core(range), DocumentMarker::DictationResult);
</ins><span class="cx">
</span><span class="cx"> // UIKit should only ever give us a DOMRange for a phrase with alternatives, which should not be part of more than one result.
</span><span class="cx"> ASSERT(markers.size() <= 1);
</span></span></pre>
</div>
</div>
</body>
</html>