<!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>[171585] branches/safari-600.1-branch/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/171585">171585</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-07-24 23:10:37 -0700 (Thu, 24 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/171203">r171203</a>. <rdar://problem/17617282></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebCoreChangeLog">branches/safari-600.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreWebCoreexpin">branches/safari-600.1-branch/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2ChangeLog">branches/safari-600.1-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2SharedEditorStatecpp">branches/safari-600.1-branch/Source/WebKit2/Shared/EditorState.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2SharedEditorStateh">branches/safari-600.1-branch/Source/WebKit2/Shared/EditorState.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessiosWKContentViewInteractionmm">branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2WebProcessWebPageWebPagecpp">branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (171584 => 171585)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-07-25 06:06:19 UTC (rev 171584)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-07-25 06:10:37 UTC (rev 171585)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2014-07-24 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r171203
+
+ 2014-07-17 Enrica Casucci <enrica@apple.com>
+
+ [REGRESSION WK2]The menu bar does not show up when tapping on the caret.
+ https://bugs.webkit.org/show_bug.cgi?id=135023
+ <rdar://problem/17617282>
+
+ Reviewed by Benjamin Poulain.
+
+ Adding some exports.
+
+ * WebCore.exp.in:
+
+2014-07-24 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r171580
</span><span class="cx">
</span><span class="cx"> 2014-07-24 Ryosuke Niwa <rniwa@webkit.org>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/WebCore.exp.in (171584 => 171585)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/WebCore.exp.in 2014-07-25 06:06:19 UTC (rev 171584)
+++ branches/safari-600.1-branch/Source/WebCore/WebCore.exp.in 2014-07-25 06:10:37 UTC (rev 171585)
</span><span class="lines">@@ -2684,6 +2684,7 @@
</span><span class="cx"> __ZN7WebCore31enableURLSchemeCanonicalizationEb
</span><span class="cx"> __ZN7WebCore33applicationIsTheEconomistOnIPhoneEv
</span><span class="cx"> __ZN7WebCore35enclosingRectExtendedToDevicePixelsERKNS_9FloatRectEf
</span><ins>+__ZN7WebCore35isEndOfEditableOrNonEditableContentERKNS_15VisiblePositionE
</ins><span class="cx"> __ZN7WebCore35positionOfNextBoundaryOfGranularityERKNS_15VisiblePositionENS_15TextGranularityENS_18SelectionDirectionE
</span><span class="cx"> __ZN7WebCore41initializeHTTPConnectionSettingsOnStartupEv
</span><span class="cx"> __ZN7WebCore4FontC1ERKNS_16FontPlatformDataEN3WTF10PassRefPtrINS_12FontSelectorEEE
</span><span class="lines">@@ -2731,6 +2732,7 @@
</span><span class="cx"> __ZN7WebCore8Document13getTouchRectsERN3WTF6VectorINS_7IntRectELm0ENS1_15CrashOnOverflowEEE
</span><span class="cx"> __ZN7WebCore8Document19dispatchWindowEventEN3WTF10PassRefPtrINS_5EventEEENS2_INS_11EventTargetEEE
</span><span class="cx"> __ZN7WebCore8IntPointC1ERK7CGPoint
</span><ins>+__ZN7WebCore8PositionC1EN3WTF10PassRefPtrINS_4NodeEEENS0_10AnchorTypeE
</ins><span class="cx"> __ZN7WebCore8PositionC1EN3WTF10PassRefPtrINS_4NodeEEENS0_19LegacyEditingOffsetE
</span><span class="cx"> __ZN7WebCore8SVGNames4initEv
</span><span class="cx"> __ZN7WebCore8Settings13gAVKitEnabledE
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/ChangeLog (171584 => 171585)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-25 06:06:19 UTC (rev 171584)
+++ branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-25 06:10:37 UTC (rev 171585)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2014-07-24 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r171203
+
+ 2014-07-17 Enrica Casucci <enrica@apple.com>
+
+ [REGRESSION WK2]The menu bar does not show up when tapping on the caret.
+ https://bugs.webkit.org/show_bug.cgi?id=135023
+ <rdar://problem/17617282>
+
+ Reviewed by Benjamin Poulain and Ryosuke Niwa.
+
+ WKContentView needs to implement hasContent to correctly show
+ the appropriate menu bar content. The patch adds this information
+ to the EditorState.
+
+ * Shared/EditorState.cpp:
+ (WebKit::EditorState::encode):
+ (WebKit::EditorState::decode):
+ * Shared/EditorState.h:
+ (WebKit::EditorState::EditorState):
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView hasContent]):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::editorState):
+
+2014-07-24 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r171576
</span><span class="cx">
</span><span class="cx"> 2014-07-24 Benjamin Poulain <bpoulain@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2SharedEditorStatecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/Shared/EditorState.cpp (171584 => 171585)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/Shared/EditorState.cpp 2014-07-25 06:06:19 UTC (rev 171584)
+++ branches/safari-600.1-branch/Source/WebKit2/Shared/EditorState.cpp 2014-07-25 06:10:37 UTC (rev 171585)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> encoder << isReplaceAllowed;
</span><ins>+ encoder << hasContent;
</ins><span class="cx"> encoder << characterAfterSelection;
</span><span class="cx"> encoder << characterBeforeSelection;
</span><span class="cx"> encoder << twoCharacterBeforeSelection;
</span><span class="lines">@@ -96,6 +97,8 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (!decoder.decode(result.isReplaceAllowed))
</span><span class="cx"> return false;
</span><ins>+ if (!decoder.decode(result.hasContent))
+ return false;
</ins><span class="cx"> if (!decoder.decode(result.characterAfterSelection))
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(result.characterBeforeSelection))
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2SharedEditorStateh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/Shared/EditorState.h (171584 => 171585)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/Shared/EditorState.h 2014-07-25 06:06:19 UTC (rev 171584)
+++ branches/safari-600.1-branch/Source/WebKit2/Shared/EditorState.h 2014-07-25 06:10:37 UTC (rev 171585)
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> , hasComposition(false)
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> , isReplaceAllowed(false)
</span><ins>+ , hasContent(false)
</ins><span class="cx"> , characterAfterSelection(0)
</span><span class="cx"> , characterBeforeSelection(0)
</span><span class="cx"> , twoCharacterBeforeSelection(0)
</span><span class="lines">@@ -76,6 +77,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> bool isReplaceAllowed;
</span><ins>+ bool hasContent;
</ins><span class="cx"> UChar32 characterAfterSelection;
</span><span class="cx"> UChar32 characterBeforeSelection;
</span><span class="cx"> UChar32 twoCharacterBeforeSelection;
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (171584 => 171585)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-07-25 06:06:19 UTC (rev 171584)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-07-25 06:10:37 UTC (rev 171585)
</span><span class="lines">@@ -2458,7 +2458,7 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)hasContent
</span><span class="cx"> {
</span><del>- return YES;
</del><ins>+ return _page->editorState().hasContent;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)selectAll
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (171584 => 171585)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-07-25 06:06:19 UTC (rev 171584)
+++ branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-07-25 06:10:37 UTC (rev 171585)
</span><span class="lines">@@ -733,8 +733,11 @@
</span><span class="cx"> // FIXME: The following check should take into account writing direction.
</span><span class="cx"> result.isReplaceAllowed = result.isContentEditable && atBoundaryOfGranularity(selection.start(), WordGranularity, DirectionForward);
</span><span class="cx"> result.wordAtSelection = plainTextReplacingNoBreakSpace(wordRangeFromPosition(selection.start()).get());
</span><del>- if (selection.isContentEditable())
</del><ins>+ if (selection.isContentEditable()) {
</ins><span class="cx"> charactersAroundPosition(selection.start(), result.characterAfterSelection, result.characterBeforeSelection, result.twoCharacterBeforeSelection);
</span><ins>+ Node* root = selection.rootEditableElement();
+ result.hasContent = root && root->hasChildNodes() && !isEndOfEditableOrNonEditableContent(firstPositionInNode(root));
+ }
</ins><span class="cx"> } else if (selection.isRange()) {
</span><span class="cx"> result.caretRectAtStart = view->contentsToRootView(VisiblePosition(selection.start()).absoluteCaretBounds());
</span><span class="cx"> result.caretRectAtEnd = view->contentsToRootView(VisiblePosition(selection.end()).absoluteCaretBounds());
</span></span></pre>
</div>
</div>
</body>
</html>