Changeset 179468 in webkit

Timestamp:

Feb 1, 2015, 10:42:33 AM (10 years ago)

Author:

mitz@apple.com

Message:

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:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/ViewGestureControllerIOS.mm (modified) (7 diffs)
• UIProcess/mac/ViewGestureController.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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:
+
 2015-01-31  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm

@@ -44 +44 @@
 #import <WebCore/QuartzCoreSPI.h>
 #import <wtf/NeverDestroyed.h>
-#import <wtf/text/StringBuilder.h>
 
 using namespace WebCore;
@@ -170 +169 @@
 }
 
-#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
-
 void ViewGestureController::beginSwipeGesture(_UINavigationInteractiveTransitionBase *transition, SwipeDirection direction)
 {
@@ -204 +177 @@
 
     m_webPageProxyForBackForwardListForCurrentSwipe = m_alternateBackForwardListSourceView.get() ? m_alternateBackForwardListSourceView.get()->_page : &m_webPageProxy;
-#if ENABLE(VIEW_GESTURE_CONTROLLER_TRACING)
-    addLogEntry(m_logEntries, String::format("m_webPageProxyForBackForwardListForCurrentSwipe: %p", m_webPageProxyForBackForwardListForCurrentSwipe.get()));
-#endif
     m_webPageProxyForBackForwardListForCurrentSwipe->navigationGestureDidBegin();
 
@@ -308 +278 @@
         RefPtr<WebPageProxy> webPageProxyForBackForwardListForCurrentSwipe = m_webPageProxyForBackForwardListForCurrentSwipe;
         removeSwipeSnapshot();
-#if ENABLE(VIEW_GESTURE_CONTROLLER_TRACING)
-        if (!webPageProxyForBackForwardListForCurrentSwipe)
-            dumpLogEntries(m_logEntries, &m_webPageProxy);
-        m_logEntries.clear();
-#endif
-
         webPageProxyForBackForwardListForCurrentSwipe->navigationGestureDidEnd(false, *targetItem);
-
         return;
     }
@@ -322 +285 @@
     if (ViewSnapshot* snapshot = targetItem->snapshot())
         m_snapshotRemovalTargetRenderTreeSize = snapshot->renderTreeSize() * swipeSnapshotRemovalRenderTreeSizeTargetFraction;
-
-#if ENABLE(VIEW_GESTURE_CONTROLLER_TRACING)
-    if (!m_webPageProxyForBackForwardListForCurrentSwipe)
-        dumpLogEntries(m_logEntries, &m_webPageProxy);
-    m_logEntries.clear();
-#endif
 
     m_webPageProxyForBackForwardListForCurrentSwipe->navigationGestureDidEnd(true, *targetItem);
@@ -350 +307 @@
 void ViewGestureController::willCommitPostSwipeTransitionLayerTree(bool successful)
 {
-#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
     if (m_activeGestureType != ViewGestureType::Swipe)
         return;
@@ -387 +341 @@
     m_swipeWatchdogTimer.stop();
 
-#if ENABLE(VIEW_GESTURE_CONTROLLER_TRACING)
-    addLogEntry(m_logEntries, String::format("m_activeGestureType: %d; m_webPageProxyForBackForwardListForCurrentSwipe: %p", m_activeGestureType, m_webPageProxyForBackForwardListForCurrentSwipe.get()));
-#endif
     if (m_activeGestureType != ViewGestureType::Swipe)
         return;

trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h

@@ -34 +34 @@
 #include <wtf/RunLoop.h>
 
-#define ENABLE_VIEW_GESTURE_CONTROLLER_TRACING 1
-
 OBJC_CLASS CALayer;
 
@@ -217 +215 @@
     RefPtr<WebPageProxy> m_webPageProxyForBackForwardListForCurrentSwipe;
     uint64_t m_gesturePendingSnapshotRemoval;
-#if ENABLE(VIEW_GESTURE_CONTROLLER_TRACING)
-    Vector<String> m_logEntries;
-#endif
 #endif
 };