<!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>[179468] 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/179468">179468</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2015-02-01 10:42:33 -0800 (Sun, 01 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove ViewGestureController tracing
https://bugs.webkit.org/show_bug.cgi?id=141137
Reviewed by Tim Horton.
Remove the tracing added in <a href="http://trac.webkit.org/projects/webkit/changeset/176133">r176133</a>, now that http://webkit.org/b/138750 is fixed.
* UIProcess/ios/ViewGestureControllerIOS.mm:
(WebKit::ViewGestureController::beginSwipeGesture):
(WebKit::ViewGestureController::endSwipeGesture):
(WebKit::ViewGestureController::willCommitPostSwipeTransitionLayerTree):
(WebKit::ViewGestureController::removeSwipeSnapshot):
(WebKit::addLogEntry): Deleted.
(WebKit::dumpLogEntries): Deleted.
* UIProcess/mac/ViewGestureController.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosViewGestureControllerIOSmm">trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacViewGestureControllerh">trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (179467 => 179468)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-02-01 15:22:57 UTC (rev 179467)
+++ trunk/Source/WebKit2/ChangeLog 2015-02-01 18:42:33 UTC (rev 179468)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-02-01 Dan Bernstein <mitz@apple.com>
+
+ Remove ViewGestureController tracing
+ https://bugs.webkit.org/show_bug.cgi?id=141137
+
+ Reviewed by Tim Horton.
+
+ Remove the tracing added in r176133, now that http://webkit.org/b/138750 is fixed.
+
+ * UIProcess/ios/ViewGestureControllerIOS.mm:
+ (WebKit::ViewGestureController::beginSwipeGesture):
+ (WebKit::ViewGestureController::endSwipeGesture):
+ (WebKit::ViewGestureController::willCommitPostSwipeTransitionLayerTree):
+ (WebKit::ViewGestureController::removeSwipeSnapshot):
+ (WebKit::addLogEntry): Deleted.
+ (WebKit::dumpLogEntries): Deleted.
+ * UIProcess/mac/ViewGestureController.h:
+
</ins><span class="cx"> 2015-01-31 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove even more Mountain Lion support
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosViewGestureControllerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm (179467 => 179468)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm 2015-02-01 15:22:57 UTC (rev 179467)
+++ trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm 2015-02-01 18:42:33 UTC (rev 179468)
</span><span class="lines">@@ -43,7 +43,6 @@
</span><span class="cx"> #import <WebCore/IOSurface.h>
</span><span class="cx"> #import <WebCore/QuartzCoreSPI.h>
</span><span class="cx"> #import <wtf/NeverDestroyed.h>
</span><del>-#import <wtf/text/StringBuilder.h>
</del><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="lines">@@ -169,32 +168,6 @@
</span><span class="cx"> m_liveSwipeView = swipingView;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(VIEW_GESTURE_CONTROLLER_TRACING)
-static void addLogEntry(Vector<String>& entries, const String& message)
-{
- void* stack[32];
- int size = WTF_ARRAY_LENGTH(stack);
- WTFGetBacktrace(stack, &size);
- StringBuilder stringBuilder;
- stringBuilder.append(String::format("%f [ ", CFAbsoluteTimeGetCurrent()));
- for (int i = 2; i < size; ++i) {
- if (i > 2)
- stringBuilder.appendLiteral(", ");
- stringBuilder.append(String::format("%p", stack[i]));
- }
- stringBuilder.appendLiteral(" ] ");
- stringBuilder.append(message);
- entries.append(stringBuilder.toString());
-}
-
-static void dumpLogEntries(const Vector<String>& entries, WebPageProxy* webPageProxy)
-{
- for (const auto& entry: entries)
- WTFLogAlways(entry.utf8().data());
- WTFLogAlways("m_webPageProxy: %p", webPageProxy);
-}
-#endif
-
</del><span class="cx"> void ViewGestureController::beginSwipeGesture(_UINavigationInteractiveTransitionBase *transition, SwipeDirection direction)
</span><span class="cx"> {
</span><span class="cx"> if (m_activeGestureType != ViewGestureType::None)
</span><span class="lines">@@ -203,9 +176,6 @@
</span><span class="cx"> m_webPageProxy.recordNavigationSnapshot();
</span><span class="cx">
</span><span class="cx"> m_webPageProxyForBackForwardListForCurrentSwipe = m_alternateBackForwardListSourceView.get() ? m_alternateBackForwardListSourceView.get()->_page : &m_webPageProxy;
</span><del>-#if ENABLE(VIEW_GESTURE_CONTROLLER_TRACING)
- addLogEntry(m_logEntries, String::format("m_webPageProxyForBackForwardListForCurrentSwipe: %p", m_webPageProxyForBackForwardListForCurrentSwipe.get()));
-#endif
</del><span class="cx"> m_webPageProxyForBackForwardListForCurrentSwipe->navigationGestureDidBegin();
</span><span class="cx">
</span><span class="cx"> auto& backForwardList = m_webPageProxyForBackForwardListForCurrentSwipe->backForwardList();
</span><span class="lines">@@ -307,14 +277,7 @@
</span><span class="cx"> // removeSwipeSnapshot will clear m_webPageProxyForBackForwardListForCurrentSwipe, so hold on to it here.
</span><span class="cx"> RefPtr<WebPageProxy> webPageProxyForBackForwardListForCurrentSwipe = m_webPageProxyForBackForwardListForCurrentSwipe;
</span><span class="cx"> removeSwipeSnapshot();
</span><del>-#if ENABLE(VIEW_GESTURE_CONTROLLER_TRACING)
- if (!webPageProxyForBackForwardListForCurrentSwipe)
- dumpLogEntries(m_logEntries, &m_webPageProxy);
- m_logEntries.clear();
-#endif
-
</del><span class="cx"> webPageProxyForBackForwardListForCurrentSwipe->navigationGestureDidEnd(false, *targetItem);
</span><del>-
</del><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -322,12 +285,6 @@
</span><span class="cx"> if (ViewSnapshot* snapshot = targetItem->snapshot())
</span><span class="cx"> m_snapshotRemovalTargetRenderTreeSize = snapshot->renderTreeSize() * swipeSnapshotRemovalRenderTreeSizeTargetFraction;
</span><span class="cx">
</span><del>-#if ENABLE(VIEW_GESTURE_CONTROLLER_TRACING)
- if (!m_webPageProxyForBackForwardListForCurrentSwipe)
- dumpLogEntries(m_logEntries, &m_webPageProxy);
- m_logEntries.clear();
-#endif
-
</del><span class="cx"> m_webPageProxyForBackForwardListForCurrentSwipe->navigationGestureDidEnd(true, *targetItem);
</span><span class="cx"> m_webPageProxyForBackForwardListForCurrentSwipe->goToBackForwardItem(targetItem);
</span><span class="cx">
</span><span class="lines">@@ -349,9 +306,6 @@
</span><span class="cx">
</span><span class="cx"> void ViewGestureController::willCommitPostSwipeTransitionLayerTree(bool successful)
</span><span class="cx"> {
</span><del>-#if ENABLE(VIEW_GESTURE_CONTROLLER_TRACING)
- addLogEntry(m_logEntries, String::format("successful: %d; m_activeGestureType: %d; m_webPageProxyForBackForwardListForCurrentSwipe: %p", successful, m_activeGestureType, m_webPageProxyForBackForwardListForCurrentSwipe.get()));
-#endif
</del><span class="cx"> if (m_activeGestureType != ViewGestureType::Swipe)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -386,9 +340,6 @@
</span><span class="cx">
</span><span class="cx"> m_swipeWatchdogTimer.stop();
</span><span class="cx">
</span><del>-#if ENABLE(VIEW_GESTURE_CONTROLLER_TRACING)
- addLogEntry(m_logEntries, String::format("m_activeGestureType: %d; m_webPageProxyForBackForwardListForCurrentSwipe: %p", m_activeGestureType, m_webPageProxyForBackForwardListForCurrentSwipe.get()));
-#endif
</del><span class="cx"> if (m_activeGestureType != ViewGestureType::Swipe)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacViewGestureControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h (179467 => 179468)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h 2015-02-01 15:22:57 UTC (rev 179467)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h 2015-02-01 18:42:33 UTC (rev 179468)
</span><span class="lines">@@ -33,8 +33,6 @@
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx">
</span><del>-#define ENABLE_VIEW_GESTURE_CONTROLLER_TRACING 1
-
</del><span class="cx"> OBJC_CLASS CALayer;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -216,10 +214,7 @@
</span><span class="cx"> WeakObjCPtr<WKWebView> m_alternateBackForwardListSourceView;
</span><span class="cx"> RefPtr<WebPageProxy> m_webPageProxyForBackForwardListForCurrentSwipe;
</span><span class="cx"> uint64_t m_gesturePendingSnapshotRemoval;
</span><del>-#if ENABLE(VIEW_GESTURE_CONTROLLER_TRACING)
- Vector<String> m_logEntries;
</del><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>