<!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>[202454] 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/202454">202454</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2016-06-24 15:25:10 -0700 (Fri, 24 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Include enclosingListType in EditorState
https://bugs.webkit.org/show_bug.cgi?id=159102
-and corresponding-
rdar://problem/26932490
Reviewed by Enrica Casucci.
Source/WebCore:
Make HTMLOListElement.h and HTMLUListElement.h Private instead of Project.
* WebCore.xcodeproj/project.pbxproj:
Export enclosingList(Node*)
* editing/htmlediting.h:
Source/WebKit2:
* Shared/EditorState.cpp:
(WebKit::EditorState::PostLayoutData::encode):
(WebKit::EditorState::PostLayoutData::decode):
* Shared/EditorState.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::editorState):</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="#trunkSourceWebCoreeditinghtmleditingh">trunk/Source/WebCore/editing/htmlediting.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedEditorStatecpp">trunk/Source/WebKit2/Shared/EditorState.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedEditorStateh">trunk/Source/WebKit2/Shared/EditorState.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202453 => 202454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-24 22:00:29 UTC (rev 202453)
+++ trunk/Source/WebCore/ChangeLog 2016-06-24 22:25:10 UTC (rev 202454)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-06-24 Beth Dakin <bdakin@apple.com>
+
+ Include enclosingListType in EditorState
+ https://bugs.webkit.org/show_bug.cgi?id=159102
+ -and corresponding-
+ rdar://problem/26932490
+
+ Reviewed by Enrica Casucci.
+
+ Make HTMLOListElement.h and HTMLUListElement.h Private instead of Project.
+ * WebCore.xcodeproj/project.pbxproj:
+
+ Export enclosingList(Node*)
+ * editing/htmlediting.h:
+
</ins><span class="cx"> 2016-06-24 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Another Windows build fix.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (202453 => 202454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-06-24 22:00:29 UTC (rev 202453)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-06-24 22:25:10 UTC (rev 202454)
</span><span class="lines">@@ -4648,8 +4648,8 @@
</span><span class="cx"> A8DF4AF10980C42C0052981B /* RenderTableCol.h in Headers */ = {isa = PBXBuildFile; fileRef = A8DF4AE70980C42C0052981B /* RenderTableCol.h */; };
</span><span class="cx"> A8EA73C30A1900E300A8EF5F /* RenderFieldset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8EA73AF0A1900E300A8EF5F /* RenderFieldset.cpp */; };
</span><span class="cx"> A8EA73C40A1900E300A8EF5F /* RenderFieldset.h in Headers */ = {isa = PBXBuildFile; fileRef = A8EA73B00A1900E300A8EF5F /* RenderFieldset.h */; };
</span><del>- A8EA79F10A1916DF00A8EF5F /* HTMLOListElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A8EA79E50A1916DF00A8EF5F /* HTMLOListElement.h */; };
- A8EA79F20A1916DF00A8EF5F /* HTMLUListElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A8EA79E60A1916DF00A8EF5F /* HTMLUListElement.h */; };
</del><ins>+ A8EA79F10A1916DF00A8EF5F /* HTMLOListElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A8EA79E50A1916DF00A8EF5F /* HTMLOListElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ A8EA79F20A1916DF00A8EF5F /* HTMLUListElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A8EA79E60A1916DF00A8EF5F /* HTMLUListElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> A8EA79F30A1916DF00A8EF5F /* HTMLUListElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8EA79E70A1916DF00A8EF5F /* HTMLUListElement.cpp */; };
</span><span class="cx"> A8EA79F40A1916DF00A8EF5F /* HTMLMenuElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A8EA79E80A1916DF00A8EF5F /* HTMLMenuElement.h */; };
</span><span class="cx"> A8EA79F50A1916DF00A8EF5F /* HTMLDListElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8EA79E90A1916DF00A8EF5F /* HTMLDListElement.cpp */; };
</span></span></pre></div>
<a id="trunkSourceWebCoreeditinghtmleditingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/htmlediting.h (202453 => 202454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/htmlediting.h 2016-06-24 22:00:29 UTC (rev 202453)
+++ trunk/Source/WebCore/editing/htmlediting.h 2016-06-24 22:25:10 UTC (rev 202454)
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> Ref<HTMLElement> createHTMLElement(Document&, const QualifiedName&);
</span><span class="cx"> Ref<HTMLElement> createHTMLElement(Document&, const AtomicString&);
</span><span class="cx">
</span><del>-HTMLElement* enclosingList(Node*);
</del><ins>+WEBCORE_EXPORT HTMLElement* enclosingList(Node*);
</ins><span class="cx"> HTMLElement* outermostEnclosingList(Node*, Node* rootList = nullptr);
</span><span class="cx"> Node* enclosingListChild(Node*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (202453 => 202454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-06-24 22:00:29 UTC (rev 202453)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-24 22:25:10 UTC (rev 202454)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-06-24 Beth Dakin <bdakin@apple.com>
+
+ Include enclosingListType in EditorState
+ https://bugs.webkit.org/show_bug.cgi?id=159102
+ -and corresponding-
+ rdar://problem/26932490
+
+ Reviewed by Enrica Casucci.
+
+ * Shared/EditorState.cpp:
+ (WebKit::EditorState::PostLayoutData::encode):
+ (WebKit::EditorState::PostLayoutData::decode):
+ * Shared/EditorState.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::editorState):
+
</ins><span class="cx"> 2016-06-24 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Inline more of the Apple Pay source code
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedEditorStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/EditorState.cpp (202453 => 202454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/EditorState.cpp 2016-06-24 22:00:29 UTC (rev 202453)
+++ trunk/Source/WebKit2/Shared/EditorState.cpp 2016-06-24 22:25:10 UTC (rev 202454)
</span><span class="lines">@@ -115,6 +115,7 @@
</span><span class="cx"> encoder << selectedTextLength;
</span><span class="cx"> encoder << textAlignment;
</span><span class="cx"> encoder << textColor;
</span><ins>+ encoder << enclosingListType;
</ins><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> encoder << caretRectAtEnd;
</span><span class="lines">@@ -150,6 +151,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(result.textColor))
</span><span class="cx"> return false;
</span><ins>+ if (!decoder.decode(result.enclosingListType))
+ return false;
</ins><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (!decoder.decode(result.caretRectAtEnd))
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedEditorStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/EditorState.h (202453 => 202454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/EditorState.h 2016-06-24 22:00:29 UTC (rev 202453)
+++ trunk/Source/WebKit2/Shared/EditorState.h 2016-06-24 22:25:10 UTC (rev 202454)
</span><span class="lines">@@ -53,6 +53,12 @@
</span><span class="cx"> JustifiedAlignment = 4,
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+enum ListType {
+ NoList = 0,
+ OrderedList,
+ UnorderedList
+};
+
</ins><span class="cx"> struct EditorState {
</span><span class="cx"> bool shouldIgnoreCompositionSelectionChange { false };
</span><span class="cx">
</span><span class="lines">@@ -82,6 +88,7 @@
</span><span class="cx"> uint64_t selectedTextLength { 0 };
</span><span class="cx"> uint32_t textAlignment { NoAlignment };
</span><span class="cx"> WebCore::Color textColor { WebCore::Color::black };
</span><ins>+ uint32_t enclosingListType { NoList };
</ins><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> WebCore::IntRect caretRectAtEnd;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (202453 => 202454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-06-24 22:00:29 UTC (rev 202453)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-06-24 22:25:10 UTC (rev 202454)
</span><span class="lines">@@ -130,8 +130,10 @@
</span><span class="cx"> #include <WebCore/HTMLFormElement.h>
</span><span class="cx"> #include <WebCore/HTMLImageElement.h>
</span><span class="cx"> #include <WebCore/HTMLInputElement.h>
</span><ins>+#include <WebCore/HTMLOListElement.h>
</ins><span class="cx"> #include <WebCore/HTMLPlugInElement.h>
</span><span class="cx"> #include <WebCore/HTMLPlugInImageElement.h>
</span><ins>+#include <WebCore/HTMLUListElement.h>
</ins><span class="cx"> #include <WebCore/HistoryController.h>
</span><span class="cx"> #include <WebCore/HistoryItem.h>
</span><span class="cx"> #include <WebCore/HitTestResult.h>
</span><span class="lines">@@ -169,6 +171,7 @@
</span><span class="cx"> #include <WebCore/UserStyleSheet.h>
</span><span class="cx"> #include <WebCore/VisiblePosition.h>
</span><span class="cx"> #include <WebCore/VisibleUnits.h>
</span><ins>+#include <WebCore/htmlediting.h>
</ins><span class="cx"> #include <WebCore/markup.h>
</span><span class="cx"> #include <bindings/ScriptValue.h>
</span><span class="cx"> #include <profiler/ProfilerDatabase.h>
</span><span class="lines">@@ -867,6 +870,17 @@
</span><span class="cx"> postLayoutData.textAlignment = style->isLeftToRightDirection() ? RightAlignment : LeftAlignment;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+
+ HTMLElement* enclosingListElement = enclosingList(selection.start().deprecatedNode());
+ if (enclosingListElement) {
+ if (is<HTMLUListElement>(*enclosingListElement))
+ postLayoutData.enclosingListType = UnorderedList;
+ else if (is<HTMLOListElement>(*enclosingListElement))
+ postLayoutData.enclosingListType = OrderedList;
+ else
+ ASSERT_NOT_REACHED();
+ } else
+ postLayoutData.enclosingListType = NoList;
</ins><span class="cx">
</span><span class="cx"> if (nodeToRemove)
</span><span class="cx"> nodeToRemove->remove(ASSERT_NO_EXCEPTION);
</span></span></pre>
</div>
</div>
</body>
</html>