<!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>[178536] trunk/Source/WebKit2</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/178536">178536</a></dd>
<dt>Author</dt> <dd>enrica@apple.com</dd>
<dt>Date</dt> <dd>2015-01-15 15:42:11 -0800 (Thu, 15 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] Add support for fully editable WKWebView.
https://bugs.webkit.org/show_bug.cgi?id=140515
Reviewed by Anders Carlsson.
WKWebView has now a new property (_editable) to control
the editability of the entire content.
* Shared/WebPageCreationParameters.cpp:
(WebKit::WebPageCreationParameters::encode):
(WebKit::WebPageCreationParameters::decode):
* Shared/WebPageCreationParameters.h:
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _isEditable]):
(-[WKWebView _setEditable:]):
* UIProcess/API/Cocoa/WKWebViewPrivate.h:
* UIProcess/API/mac/WKView.mm:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::setEditable):
(WebKit::WebPageProxy::creationParameters):
* UIProcess/WebPageProxy.h:
(WebKit::WebPageProxy::isEditable):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::setEditable):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPageCreationParameterscpp">trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPageCreationParametersh">trunk/Source/WebKit2/Shared/WebPageCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (178535 => 178536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-15 23:16:18 UTC (rev 178535)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-15 23:42:11 UTC (rev 178536)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2015-01-15 Enrica Casucci <enrica@apple.com>
+
+ [WK2] Add support for fully editable WKWebView.
+ https://bugs.webkit.org/show_bug.cgi?id=140515
+
+ Reviewed by Anders Carlsson.
+
+ WKWebView has now a new property (_editable) to control
+ the editability of the entire content.
+
+ * Shared/WebPageCreationParameters.cpp:
+ (WebKit::WebPageCreationParameters::encode):
+ (WebKit::WebPageCreationParameters::decode):
+ * Shared/WebPageCreationParameters.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _isEditable]):
+ (-[WKWebView _setEditable:]):
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+ * UIProcess/API/mac/WKView.mm:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+ (WebKit::WebPageProxy::setEditable):
+ (WebKit::WebPageProxy::creationParameters):
+ * UIProcess/WebPageProxy.h:
+ (WebKit::WebPageProxy::isEditable):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::setEditable):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+
</ins><span class="cx"> 2015-01-15 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Clearing the website data store should clear local storage
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPageCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp (178535 => 178536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp 2015-01-15 23:16:18 UTC (rev 178535)
+++ trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp 2015-01-15 23:42:11 UTC (rev 178536)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> encoder.encodeEnum(drawingAreaType);
</span><span class="cx"> encoder << pageGroupData;
</span><span class="cx"> encoder << drawsBackground;
</span><ins>+ encoder << isEditable;
</ins><span class="cx"> encoder << drawsTransparentBackground;
</span><span class="cx"> encoder << underlayColor;
</span><span class="cx"> encoder << useFixedLayout;
</span><span class="lines">@@ -95,6 +96,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.drawsBackground))
</span><span class="cx"> return false;
</span><ins>+ if (!decoder.decode(parameters.isEditable))
+ return false;
</ins><span class="cx"> if (!decoder.decode(parameters.drawsTransparentBackground))
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.underlayColor))
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPageCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPageCreationParameters.h (178535 => 178536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPageCreationParameters.h 2015-01-15 23:16:18 UTC (rev 178535)
+++ trunk/Source/WebKit2/Shared/WebPageCreationParameters.h 2015-01-15 23:42:11 UTC (rev 178536)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx">
</span><span class="cx"> bool drawsBackground;
</span><span class="cx"> bool drawsTransparentBackground;
</span><ins>+ bool isEditable;
</ins><span class="cx">
</span><span class="cx"> WebCore::Color underlayColor;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (178535 => 178536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-01-15 23:16:18 UTC (rev 178535)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-01-15 23:42:11 UTC (rev 178536)
</span><span class="lines">@@ -1605,6 +1605,16 @@
</span><span class="cx">
</span><span class="cx"> @implementation WKWebView (WKPrivate)
</span><span class="cx">
</span><ins>+- (BOOL)_isEditable
+{
+ return _page->isEditable();
+}
+
+- (void)_setEditable:(BOOL)editable
+{
+ _page->setEditable(editable);
+}
+
</ins><span class="cx"> - (_WKRemoteObjectRegistry *)_remoteObjectRegistry
</span><span class="cx"> {
</span><span class="cx"> if (!_remoteObjectRegistry) {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (178535 => 178536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2015-01-15 23:16:18 UTC (rev 178535)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2015-01-15 23:42:11 UTC (rev 178536)
</span><span class="lines">@@ -82,6 +82,8 @@
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, readonly) pid_t _webProcessIdentifier;
</span><span class="cx">
</span><ins>+@property (nonatomic, getter=_isEditable, setter=_setEditable:) BOOL _editable;
+
</ins><span class="cx"> // FIXME: Remove these once nobody is using them.
</span><span class="cx"> @property (nonatomic, readonly) NSData *_sessionStateData;
</span><span class="cx"> - (void)_restoreFromSessionStateData:(NSData *)sessionStateData;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (178535 => 178536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-01-15 23:16:18 UTC (rev 178535)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-01-15 23:42:11 UTC (rev 178536)
</span><span class="lines">@@ -743,11 +743,9 @@
</span><span class="cx">
</span><span class="cx"> Editing-related methods still unimplemented that are implemented in WebKit1:
</span><span class="cx">
</span><del>-- (void)capitalizeWord:(id)sender;
</del><span class="cx"> - (void)changeFont:(id)sender;
</span><span class="cx"> - (void)complete:(id)sender;
</span><span class="cx"> - (void)copyFont:(id)sender;
</span><del>-- (void)lowercaseWord:(id)sender;
</del><span class="cx"> - (void)makeBaseWritingDirectionLeftToRight:(id)sender;
</span><span class="cx"> - (void)makeBaseWritingDirectionNatural:(id)sender;
</span><span class="cx"> - (void)makeBaseWritingDirectionRightToLeft:(id)sender;
</span><span class="lines">@@ -755,7 +753,6 @@
</span><span class="cx"> - (void)scrollLineDown:(id)sender;
</span><span class="cx"> - (void)scrollLineUp:(id)sender;
</span><span class="cx"> - (void)showGuessPanel:(id)sender;
</span><del>-- (void)uppercaseWord:(id)sender;
</del><span class="cx">
</span><span class="cx"> Some other editing-related methods still unimplemented:
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (178535 => 178536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-01-15 23:16:18 UTC (rev 178535)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-01-15 23:42:11 UTC (rev 178536)
</span><span class="lines">@@ -291,6 +291,7 @@
</span><span class="cx"> #if PLATFORM(MAC) && !USE(ASYNC_NSTEXTINPUTCLIENT)
</span><span class="cx"> , m_temporarilyClosedComposition(false)
</span><span class="cx"> #endif
</span><ins>+ , m_isEditable(false)
</ins><span class="cx"> , m_textZoomFactor(1)
</span><span class="cx"> , m_pageZoomFactor(1)
</span><span class="cx"> , m_pageScaleFactor(1)
</span><span class="lines">@@ -1394,6 +1395,17 @@
</span><span class="cx"> m_process->send(Messages::WebPage::ExecuteEditCommand(commandName), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPageProxy::setEditable(bool editable)
+{
+ if (editable == m_isEditable)
+ return;
+ if (!isValid())
+ return;
+
+ m_isEditable = editable;
+ m_process->send(Messages::WebPage::SetEditable(editable), m_pageID);
+}
+
</ins><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> void WebPageProxy::didCommitLayerTree(const RemoteLayerTreeTransaction&)
</span><span class="cx"> {
</span><span class="lines">@@ -4616,6 +4628,7 @@
</span><span class="cx"> parameters.store = preferencesStore();
</span><span class="cx"> parameters.pageGroupData = m_pageGroup->data();
</span><span class="cx"> parameters.drawsBackground = m_drawsBackground;
</span><ins>+ parameters.isEditable = m_isEditable;
</ins><span class="cx"> parameters.drawsTransparentBackground = m_drawsTransparentBackground;
</span><span class="cx"> parameters.underlayColor = m_underlayColor;
</span><span class="cx"> parameters.useFixedLayout = m_useFixedLayout;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (178535 => 178536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-01-15 23:16:18 UTC (rev 178535)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-01-15 23:42:11 UTC (rev 178536)
</span><span class="lines">@@ -411,6 +411,8 @@
</span><span class="cx">
</span><span class="cx"> bool maintainsInactiveSelection() const { return m_maintainsInactiveSelection; }
</span><span class="cx"> void setMaintainsInactiveSelection(bool);
</span><ins>+ void setEditable(bool);
+ bool isEditable() const { return m_isEditable; }
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> void executeEditCommand(const String& commandName, std::function<void (CallbackBase::Error)>);
</span><span class="lines">@@ -1446,6 +1448,7 @@
</span><span class="cx"> String m_toolTip;
</span><span class="cx">
</span><span class="cx"> EditorState m_editorState;
</span><ins>+ bool m_isEditable;
</ins><span class="cx"> #if PLATFORM(MAC) && !USE(ASYNC_NSTEXTINPUTCLIENT)
</span><span class="cx"> bool m_temporarilyClosedComposition; // Editor state changed from hasComposition to !hasComposition, but that was only with shouldIgnoreCompositionSelectionChange yet.
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (178535 => 178536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-01-15 23:16:18 UTC (rev 178535)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-01-15 23:42:11 UTC (rev 178536)
</span><span class="lines">@@ -921,6 +921,19 @@
</span><span class="cx"> frame.editor().command(commandName).execute(argument);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPage::setEditable(bool editable)
+{
+ m_page->setEditable(editable);
+ m_page->setTabKeyCyclesThroughElements(!editable);
+ Frame& frame = m_page->focusController().focusedOrMainFrame();
+ if (editable) {
+ frame.editor().applyEditingStyleToBodyElement();
+ // If the page is made editable and the selection is empty, set it to something.
+ if (frame.selection().isNone())
+ frame.selection().setSelectionFromNone();
+ }
+}
+
</ins><span class="cx"> bool WebPage::isEditingCommandEnabled(const String& commandName)
</span><span class="cx"> {
</span><span class="cx"> Frame& frame = m_page->focusController().focusedOrMainFrame();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (178535 => 178536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-01-15 23:16:18 UTC (rev 178535)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-01-15 23:42:11 UTC (rev 178536)
</span><span class="lines">@@ -933,6 +933,7 @@
</span><span class="cx"> void setViewState(WebCore::ViewState::Flags, bool wantsDidUpdateViewState, const Vector<uint64_t>& callbackIDs);
</span><span class="cx"> void validateCommand(const String&, uint64_t);
</span><span class="cx"> void executeEditCommand(const String&);
</span><ins>+ void setEditable(bool);
</ins><span class="cx">
</span><span class="cx"> void updateUserActivity();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (178535 => 178536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-01-15 23:16:18 UTC (rev 178535)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-01-15 23:42:11 UTC (rev 178536)
</span><span class="lines">@@ -179,6 +179,7 @@
</span><span class="cx"> Close()
</span><span class="cx"> TryClose()
</span><span class="cx">
</span><ins>+ SetEditable(bool editable)
</ins><span class="cx"> ValidateCommand(String name, uint64_t callbackID)
</span><span class="cx"> ExecuteEditCommand(String name)
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>