<!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>[164622] 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/164622">164622</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-02-24 18:59:18 -0800 (Mon, 24 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use RetainPtrs for two WKContentView data members
https://bugs.webkit.org/show_bug.cgi?id=129276
Reviewed by Benjamin Poulain.
The UITextInputTraits were leaked. Fix with RetainPtr goodness.
Rename the obscure _accessory to _formAccessoryView and
make it a RetainPtr.
Rearrange the data members of the WKContentView class extension
for better packing and readability.
* UIProcess/ios/WKContentView.h:
* UIProcess/ios/WKContentViewInteraction.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView cleanupInteraction]):
(-[WKContentView inputAccessoryView]):
(-[WKContentView _updateAccessory]):
(-[WKContentView textInputTraits]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionh">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (164621 => 164622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-25 02:40:28 UTC (rev 164621)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-25 02:59:18 UTC (rev 164622)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2014-02-24 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Use RetainPtrs for two WKContentView data members
+ https://bugs.webkit.org/show_bug.cgi?id=129276
+
+ Reviewed by Benjamin Poulain.
+
+ The UITextInputTraits were leaked. Fix with RetainPtr goodness.
+
+ Rename the obscure _accessory to _formAccessoryView and
+ make it a RetainPtr.
+
+ Rearrange the data members of the WKContentView class extension
+ for better packing and readability.
+
+ * UIProcess/ios/WKContentView.h:
+ * UIProcess/ios/WKContentViewInteraction.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView cleanupInteraction]):
+ (-[WKContentView inputAccessoryView]):
+ (-[WKContentView _updateAccessory]):
+ (-[WKContentView textInputTraits]):
+
+2014-02-24 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Remove WKInteractionView, move code into WKContentView
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=129275
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (164621 => 164622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2014-02-25 02:40:28 UTC (rev 164621)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2014-02-25 02:59:18 UTC (rev 164622)
</span><span class="lines">@@ -71,6 +71,7 @@
</span><span class="cx">
</span><span class="cx"> @interface WKContentView () {
</span><span class="cx"> RetainPtr<UIWebTouchEventsGestureRecognizer> _touchEventGestureRecognizer;
</span><ins>+
</ins><span class="cx"> BOOL _canSendTouchEventsAsynchronously;
</span><span class="cx"> unsigned _nativeWebTouchEventUniqueIdBeingSentSynchronously;
</span><span class="cx">
</span><span class="lines">@@ -84,20 +85,23 @@
</span><span class="cx"> RetainPtr<UIWKTextInteractionAssistant> _textSelectionAssistant;
</span><span class="cx"> RetainPtr<UIWKSelectionAssistant> _webSelectionAssistant;
</span><span class="cx">
</span><del>- UITextInputTraits *_traits;
- BOOL _isEditable;
- UIWebFormAccessory *_accessory;
</del><ins>+ RetainPtr<UITextInputTraits> _traits;
+ RetainPtr<UIWebFormAccessory> _formAccessoryView;
+ RetainPtr<_UIHighlightView> _highlightView;
+ RetainPtr<NSString> _markedText;
+ RetainPtr<WKActionSheetAssistant> _actionSheetAssistant;
+
</ins><span class="cx"> id <UITextInputDelegate> _inputDelegate;
</span><del>- BOOL _showingTextStyleOptions;
</del><span class="cx">
</span><del>- RetainPtr<_UIHighlightView> _highlightView;
</del><span class="cx"> uint64_t _latestTapHighlightID;
</span><del>- BOOL _isTapHighlightIDValid;
</del><ins>+
</ins><span class="cx"> WebKit::WKAutoCorrectionData _autocorrectionData;
</span><del>- RetainPtr<NSString> _markedText;
</del><span class="cx"> WebKit::InteractionInformationAtPosition _positionInformation;
</span><ins>+
+ BOOL _isEditable;
+ BOOL _showingTextStyleOptions;
</ins><span class="cx"> BOOL _hasValidPositionInformation;
</span><del>- RetainPtr<WKActionSheetAssistant> _actionSheetAssistant;
</del><ins>+ BOOL _isTapHighlightIDValid;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="lines">@@ -105,6 +109,8 @@
</span><span class="cx"> @interface WKContentView (WKInteraction) <UIGestureRecognizerDelegate, UIWebTouchEventsGestureRecognizerDelegate, UITextInputPrivate, UIWebFormAccessoryDelegate, UIWKInteractionViewProtocol>
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, readonly) BOOL isEditable;
</span><ins>+@property (nonatomic, readonly) const WebKit::InteractionInformationAtPosition& positionInformation;
+@property (nonatomic, readonly) const WebKit::WKAutoCorrectionData& autocorrectionData;
</ins><span class="cx">
</span><span class="cx"> - (void)setupInteraction;
</span><span class="cx"> - (void)cleanupInteraction;
</span><span class="lines">@@ -125,7 +131,4 @@
</span><span class="cx"> - (void)_didEndScrollingOrZooming;
</span><span class="cx"> - (void)_didUpdateBlockSelectionWithTouch:(WebKit::WKSelectionTouch)touch withFlags:(WebKit::WKSelectionFlags)flags growThreshold:(CGFloat)growThreshold shrinkThreshold:(CGFloat)shrinkThreshold;
</span><span class="cx">
</span><del>-@property (readonly, nonatomic) const WebKit::InteractionInformationAtPosition& positionInformation;
-@property (readonly, nonatomic) const WebKit::WKAutoCorrectionData& autocorrectionData;
-
</del><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (164621 => 164622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-02-25 02:40:28 UTC (rev 164621)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-02-25 02:59:18 UTC (rev 164622)
</span><span class="lines">@@ -184,8 +184,6 @@
</span><span class="cx"> [_highlightLongPressGestureRecognizer setDelegate:nil];
</span><span class="cx"> [_longPressGestureRecognizer setDelegate:nil];
</span><span class="cx"> [_twoFingerPanGestureRecognizer setDelegate:nil];
</span><del>-
- [_accessory release];
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (const InteractionInformationAtPosition&)positionInformation
</span><span class="lines">@@ -677,12 +675,12 @@
</span><span class="cx"> if (!_isEditable)
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- if (!_accessory) {
- _accessory = [[UIWebFormAccessory alloc] init];
- _accessory.delegate = self;
</del><ins>+ if (!_formAccessoryView) {
+ _formAccessoryView = adoptNS([[UIWebFormAccessory alloc] init]);
+ [_formAccessoryView setDelegate:self];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return _accessory;
</del><ins>+ return _formAccessoryView.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSArray *)supportedPasteboardTypesForCurrentSelection
</span><span class="lines">@@ -1226,10 +1224,10 @@
</span><span class="cx"> - (void)_updateAccessory
</span><span class="cx"> {
</span><span class="cx"> // FIXME: We need to initialize with values from the WebProcess.
</span><del>- _accessory.nextEnabled = YES;
- _accessory.previousEnabled = YES;
</del><ins>+ [_formAccessoryView setNextEnabled:YES];
+ [_formAccessoryView setPreviousEnabled:YES];
</ins><span class="cx">
</span><del>- [_accessory setClearVisible:NO];
</del><ins>+ [_formAccessoryView setClearVisible:NO];
</ins><span class="cx">
</span><span class="cx"> // FIXME: hide or show the AutoFill button as needed.
</span><span class="cx"> }
</span><span class="lines">@@ -1410,8 +1408,9 @@
</span><span class="cx"> - (UITextInputTraits *)textInputTraits
</span><span class="cx"> {
</span><span class="cx"> if (!_traits)
</span><del>- _traits = [[UITextInputTraits alloc] init];
- return _traits;
</del><ins>+ _traits = adoptNS([[UITextInputTraits alloc] init]);
+
+ return _traits.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (UITextInteractionAssistant *)interactionAssistant
</span></span></pre>
</div>
</div>
</body>
</html>