<!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>[164598] 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/164598">164598</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-02-24 12:18:10 -0800 (Mon, 24 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename PageClientImplIOS::m_view to m_contentView
https://bugs.webkit.org/show_bug.cgi?id=129124
Reviewed by Benjamin Poulain.
Simple rename of m_view to m_contentView in preparation for
also holding onto the WKView.
* UIProcess/API/ios/PageClientImplIOS.h:
* UIProcess/API/ios/PageClientImplIOS.mm:
(WebKit::PageClientImpl::PageClientImpl):
(WebKit::PageClientImpl::createDrawingAreaProxy):
(WebKit::PageClientImpl::viewSize):
(WebKit::PageClientImpl::isViewInWindow):
(WebKit::PageClientImpl::processDidExit):
(WebKit::PageClientImpl::didRelaunchProcess):
(WebKit::PageClientImpl::decidePolicyForGeolocationPermissionRequest):
(WebKit::PageClientImpl::didCommitLoadForMainFrame):
(WebKit::PageClientImpl::interpretKeyEvent):
(WebKit::PageClientImpl::positionInformationDidChange):
(WebKit::PageClientImpl::selectionDidChange):
(WebKit::PageClientImpl::screenToRootView):
(WebKit::PageClientImpl::rootViewToScreen):
(WebKit::PageClientImpl::setAcceleratedCompositingRootLayer):
(WebKit::PageClientImpl::takeViewSnapshot):
(WebKit::PageClientImpl::didGetTapHighlightGeometries):
(WebKit::PageClientImpl::didCommitLayerTree):
(WebKit::PageClientImpl::startAssistingNode):
(WebKit::PageClientImpl::stopAssistingNode):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIiosPageClientImplIOSh">trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIiosPageClientImplIOSmm">trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (164597 => 164598)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-24 19:43:19 UTC (rev 164597)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-24 20:18:10 UTC (rev 164598)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2014-02-24 Simon Fraser <simon.fraser@apple.com>
+
+ Rename PageClientImplIOS::m_view to m_contentView
+ https://bugs.webkit.org/show_bug.cgi?id=129124
+
+ Reviewed by Benjamin Poulain.
+
+ Simple rename of m_view to m_contentView in preparation for
+ also holding onto the WKView.
+
+ * UIProcess/API/ios/PageClientImplIOS.h:
+ * UIProcess/API/ios/PageClientImplIOS.mm:
+ (WebKit::PageClientImpl::PageClientImpl):
+ (WebKit::PageClientImpl::createDrawingAreaProxy):
+ (WebKit::PageClientImpl::viewSize):
+ (WebKit::PageClientImpl::isViewInWindow):
+ (WebKit::PageClientImpl::processDidExit):
+ (WebKit::PageClientImpl::didRelaunchProcess):
+ (WebKit::PageClientImpl::decidePolicyForGeolocationPermissionRequest):
+ (WebKit::PageClientImpl::didCommitLoadForMainFrame):
+ (WebKit::PageClientImpl::interpretKeyEvent):
+ (WebKit::PageClientImpl::positionInformationDidChange):
+ (WebKit::PageClientImpl::selectionDidChange):
+ (WebKit::PageClientImpl::screenToRootView):
+ (WebKit::PageClientImpl::rootViewToScreen):
+ (WebKit::PageClientImpl::setAcceleratedCompositingRootLayer):
+ (WebKit::PageClientImpl::takeViewSnapshot):
+ (WebKit::PageClientImpl::didGetTapHighlightGeometries):
+ (WebKit::PageClientImpl::didCommitLayerTree):
+ (WebKit::PageClientImpl::startAssistingNode):
+ (WebKit::PageClientImpl::stopAssistingNode):
+
</ins><span class="cx"> 2014-02-24 Enrique Ocaña González <eocanha@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r164438): [GTK] Tests /webkit2/WebKitWebView/tls-errors-policy and /webkit2/WebKitWebContext/uri-scheme fail
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIiosPageClientImplIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.h (164597 => 164598)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.h 2014-02-24 19:43:19 UTC (rev 164597)
+++ trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.h 2014-02-24 20:18:10 UTC (rev 164598)
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> virtual void beganExitFullScreen(const WebCore::IntRect& initialFrame, const WebCore::IntRect& finalFrame) override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- WKContentView *m_view;
</del><ins>+ WKContentView *m_contentView;
</ins><span class="cx"> };
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIiosPageClientImplIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.mm (164597 => 164598)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.mm 2014-02-24 19:43:19 UTC (rev 164597)
+++ trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.mm 2014-02-24 20:18:10 UTC (rev 164598)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> PageClientImpl::PageClientImpl(WKContentView *view)
</span><del>- : m_view(view)
</del><ins>+ : m_contentView(view)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<DrawingAreaProxy> PageClientImpl::createDrawingAreaProxy()
</span><span class="cx"> {
</span><del>- return [m_view _createDrawingAreaProxy];
</del><ins>+ return [m_contentView _createDrawingAreaProxy];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageClientImpl::setViewNeedsDisplay(const IntRect& rect)
</span><span class="lines">@@ -82,10 +82,10 @@
</span><span class="cx">
</span><span class="cx"> IntSize PageClientImpl::viewSize()
</span><span class="cx"> {
</span><del>- if (UIScrollView *scroller = [m_view _scroller])
</del><ins>+ if (UIScrollView *scroller = [m_contentView _scroller])
</ins><span class="cx"> return IntSize(scroller.bounds.size);
</span><span class="cx">
</span><del>- return IntSize(m_view.bounds.size);
</del><ins>+ return IntSize(m_contentView.bounds.size);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool PageClientImpl::isViewWindowActive()
</span><span class="lines">@@ -108,17 +108,17 @@
</span><span class="cx">
</span><span class="cx"> bool PageClientImpl::isViewInWindow()
</span><span class="cx"> {
</span><del>- return [m_view window];
</del><ins>+ return [m_contentView window];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageClientImpl::processDidExit()
</span><span class="cx"> {
</span><del>- [m_view _processDidExit];
</del><ins>+ [m_contentView _processDidExit];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageClientImpl::didRelaunchProcess()
</span><span class="cx"> {
</span><del>- [m_view _didRelaunchProcess];
</del><ins>+ [m_contentView _didRelaunchProcess];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageClientImpl::pageClosed()
</span><span class="lines">@@ -138,13 +138,13 @@
</span><span class="cx">
</span><span class="cx"> bool PageClientImpl::decidePolicyForGeolocationPermissionRequest(WebFrameProxy& frame, WebSecurityOrigin& origin, GeolocationPermissionRequestProxy& request)
</span><span class="cx"> {
</span><del>- [m_view _decidePolicyForGeolocationRequestFromOrigin:origin frame:frame request:request];
</del><ins>+ [m_contentView _decidePolicyForGeolocationRequestFromOrigin:origin frame:frame request:request];
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageClientImpl::didCommitLoadForMainFrame()
</span><span class="cx"> {
</span><del>- [m_view _didCommitLoadForMainFrame];
</del><ins>+ [m_contentView _didCommitLoadForMainFrame];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageClientImpl::setCursor(const Cursor&)
</span><span class="lines">@@ -196,12 +196,12 @@
</span><span class="cx">
</span><span class="cx"> bool PageClientImpl::interpretKeyEvent(const NativeWebKeyboardEvent& event, bool isCharEvent)
</span><span class="cx"> {
</span><del>- return [m_view _interpretKeyEvent:event.nativeEvent() isCharEvent:isCharEvent];
</del><ins>+ return [m_contentView _interpretKeyEvent:event.nativeEvent() isCharEvent:isCharEvent];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageClientImpl::positionInformationDidChange(const InteractionInformationAtPosition& info)
</span><span class="cx"> {
</span><del>- [m_view _positionInformationDidChange:info];
</del><ins>+ [m_contentView _positionInformationDidChange:info];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageClientImpl::saveImageToLibrary(PassRefPtr<SharedBuffer> imageBuffer)
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx">
</span><span class="cx"> void PageClientImpl::selectionDidChange()
</span><span class="cx"> {
</span><del>- [m_view _selectionChanged];
</del><ins>+ [m_contentView _selectionChanged];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageClientImpl::updateSecureInputState()
</span><span class="lines">@@ -260,12 +260,12 @@
</span><span class="cx">
</span><span class="cx"> IntPoint PageClientImpl::screenToRootView(const IntPoint& point)
</span><span class="cx"> {
</span><del>- return IntPoint([m_view convertPoint:point fromView:nil]);
</del><ins>+ return IntPoint([m_contentView convertPoint:point fromView:nil]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntRect PageClientImpl::rootViewToScreen(const IntRect& rect)
</span><span class="cx"> {
</span><del>- return enclosingIntRect([m_view convertRect:rect toView:nil]);
</del><ins>+ return enclosingIntRect([m_contentView convertRect:rect toView:nil]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent&, bool)
</span><span class="lines">@@ -276,7 +276,7 @@
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> void PageClientImpl::doneWithTouchEvent(const NativeWebTouchEvent& nativeWebtouchEvent, bool eventHandled)
</span><span class="cx"> {
</span><del>- [m_view _webTouchEvent:nativeWebtouchEvent preventsNativeGestures:eventHandled];
</del><ins>+ [m_contentView _webTouchEvent:nativeWebtouchEvent preventsNativeGestures:eventHandled];
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -312,7 +312,7 @@
</span><span class="cx">
</span><span class="cx"> void PageClientImpl::setAcceleratedCompositingRootLayer(CALayer *rootLayer)
</span><span class="cx"> {
</span><del>- [m_view _setAcceleratedCompositingRootLayer:rootLayer];
</del><ins>+ [m_contentView _setAcceleratedCompositingRootLayer:rootLayer];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CALayer *PageClientImpl::acceleratedCompositingRootLayer() const
</span><span class="lines">@@ -323,7 +323,7 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<CGImageRef> PageClientImpl::takeViewSnapshot()
</span><span class="cx"> {
</span><del>- return [m_view _takeViewSnapshot];
</del><ins>+ return [m_contentView _takeViewSnapshot];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageClientImpl::wheelEventWasNotHandledByWebCore(const NativeWebWheelEvent& event)
</span><span class="lines">@@ -338,27 +338,27 @@
</span><span class="cx">
</span><span class="cx"> void PageClientImpl::didGetTapHighlightGeometries(uint64_t requestID, const WebCore::Color& color, const Vector<WebCore::FloatQuad>& highlightedQuads, const WebCore::IntSize& topLeftRadius, const WebCore::IntSize& topRightRadius, const WebCore::IntSize& bottomLeftRadius, const WebCore::IntSize& bottomRightRadius)
</span><span class="cx"> {
</span><del>- [m_view _didGetTapHighlightForRequest:requestID color:color quads:highlightedQuads topLeftRadius:topLeftRadius topRightRadius:topRightRadius bottomLeftRadius:bottomLeftRadius bottomRightRadius:bottomRightRadius];
</del><ins>+ [m_contentView _didGetTapHighlightForRequest:requestID color:color quads:highlightedQuads topLeftRadius:topLeftRadius topRightRadius:topRightRadius bottomLeftRadius:bottomLeftRadius bottomRightRadius:bottomRightRadius];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageClientImpl::didCommitLayerTree(const RemoteLayerTreeTransaction& layerTreeTransaction)
</span><span class="cx"> {
</span><del>- [m_view _didCommitLayerTree:layerTreeTransaction];
</del><ins>+ [m_contentView _didCommitLayerTree:layerTreeTransaction];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageClientImpl::startAssistingNode(const WebCore::IntRect&, bool, bool)
</span><span class="cx"> {
</span><del>- [m_view _startAssistingNode];
</del><ins>+ [m_contentView _startAssistingNode];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageClientImpl::stopAssistingNode()
</span><span class="cx"> {
</span><del>- [m_view _stopAssistingNode];
</del><ins>+ [m_contentView _stopAssistingNode];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageClientImpl::didUpdateBlockSelectionWithTouch(uint32_t touch, uint32_t flags, float growThreshold, float shrinkThreshold)
</span><span class="cx"> {
</span><del>- [m_view _didUpdateBlockSelectionWithTouch:(WKSelectionTouch)touch withFlags:(WKSelectionFlags)flags growThreshold:growThreshold shrinkThreshold:shrinkThreshold];
</del><ins>+ [m_contentView _didUpdateBlockSelectionWithTouch:(WKSelectionTouch)touch withFlags:(WKSelectionFlags)flags growThreshold:growThreshold shrinkThreshold:shrinkThreshold];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span></span></pre>
</div>
</div>
</body>
</html>