Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (214083 => 214084)
--- trunk/Source/_javascript_Core/ChangeLog 2017-03-17 00:23:45 UTC (rev 214083)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-03-17 00:47:16 UTC (rev 214084)
@@ -1,3 +1,19 @@
+2017-03-16 Simon Fraser <[email protected]>
+
+ Improve the system tracing points
+ https://bugs.webkit.org/show_bug.cgi?id=169790
+
+ Reviewed by Zalan Bujtas.
+
+ Use a more cohesive set of system trace points that give a good overview of what
+ WebKit is doing. Added points for resource loading, render tree building, sync messages
+ to the web process, async image decode, WASM and fetching cookies.
+
+ * wasm/WasmPlan.cpp:
+ (JSC::Wasm::Plan::run):
+ * wasm/js/WebAssemblyFunction.cpp:
+ (JSC::callWebAssemblyFunction):
+
2017-03-16 Mark Lam <[email protected]>
Array concat operation should check for length overflows.
Modified: trunk/Source/_javascript_Core/wasm/WasmPlan.cpp (214083 => 214084)
--- trunk/Source/_javascript_Core/wasm/WasmPlan.cpp 2017-03-17 00:23:45 UTC (rev 214083)
+++ trunk/Source/_javascript_Core/wasm/WasmPlan.cpp 2017-03-17 00:47:16 UTC (rev 214084)
@@ -44,6 +44,7 @@
#include <wtf/MonotonicTime.h>
#include <wtf/NumberOfCores.h>
#include <wtf/StdLibExtras.h>
+#include <wtf/SystemTracing.h>
#include <wtf/text/StringBuilder.h>
namespace JSC { namespace Wasm {
@@ -114,6 +115,9 @@
{
if (!parseAndValidateModule(recompileMode))
return;
+
+ TraceScope traceScope(WebAssemblyCompileStart, WebAssemblyCompileEnd);
+
if (recompileMode)
ASSERT(m_moduleInformation->memory.mode() == recompileMode);
Modified: trunk/Source/_javascript_Core/wasm/js/WebAssemblyFunction.cpp (214083 => 214084)
--- trunk/Source/_javascript_Core/wasm/js/WebAssemblyFunction.cpp 2017-03-17 00:23:45 UTC (rev 214083)
+++ trunk/Source/_javascript_Core/wasm/js/WebAssemblyFunction.cpp 2017-03-17 00:47:16 UTC (rev 214084)
@@ -41,6 +41,7 @@
#include "VM.h"
#include "WasmFormat.h"
#include "WasmMemory.h"
+#include <wtf/SystemTracing.h>
namespace JSC {
@@ -76,6 +77,8 @@
}
}
+ TraceScope traceScope(WebAssemblyExecuteStart, WebAssemblyExecuteEnd);
+
Vector<JSValue> boxedArgs;
for (unsigned argIndex = 0; argIndex < signature->argumentCount(); ++argIndex) {
JSValue arg = exec->argument(argIndex);
Modified: trunk/Source/WTF/ChangeLog (214083 => 214084)
--- trunk/Source/WTF/ChangeLog 2017-03-17 00:23:45 UTC (rev 214083)
+++ trunk/Source/WTF/ChangeLog 2017-03-17 00:47:16 UTC (rev 214084)
@@ -1,3 +1,16 @@
+2017-03-16 Simon Fraser <[email protected]>
+
+ Improve the system tracing points
+ https://bugs.webkit.org/show_bug.cgi?id=169790
+
+ Reviewed by Zalan Bujtas.
+
+ Use a more cohesive set of system trace points that give a good overview of what
+ WebKit is doing. Added points for resource loading, render tree building, sync messages
+ to the web process, async image decode, WASM and fetching cookies.
+
+ * wtf/SystemTracing.h:
+
2017-03-16 Carlos Garcia Campos <[email protected]>
[UNIX] Implement currentSearchLocaleID() and currentTextBreakLocaleID()
Modified: trunk/Source/WTF/wtf/SystemTracing.h (214083 => 214084)
--- trunk/Source/WTF/wtf/SystemTracing.h 2017-03-17 00:23:45 UTC (rev 214083)
+++ trunk/Source/WTF/wtf/SystemTracing.h 2017-03-17 00:47:16 UTC (rev 214084)
@@ -43,37 +43,48 @@
_javascript_Range = 2500,
VMEntryScopeStart,
VMEntryScopeEnd,
+ WebAssemblyCompileStart,
+ WebAssemblyCompileEnd,
+ WebAssemblyExecuteStart,
+ WebAssemblyExecuteEnd,
WebCoreRange = 5000,
+ MainResourceLoadDidStartProvisional,
+ MainResourceLoadDidEnd,
+ SubresourceLoadWillStart,
+ SubresourceLoadDidEnd,
+ FetchCookiesStart,
+ FetchCookiesEnd,
StyleRecalcStart,
StyleRecalcEnd,
+ RenderTreeBuildStart,
+ RenderTreeBuildEnd,
LayoutStart,
LayoutEnd,
- PaintViewStart,
- PaintViewEnd,
PaintLayerStart,
PaintLayerEnd,
- RAFDisplayLinkScheduled,
- RAFDisplayLinkFired,
+ AsyncImageDecodeStart,
+ AsyncImageDecodeEnd,
RAFCallbackStart,
RAFCallbackEnd,
WebKitRange = 10000,
+ WebHTMLViewPaintStart,
+ WebHTMLViewPaintEnd,
+
WebKit2Range = 12000,
+ BackingStoreFlushStart,
+ BackingStoreFlushEnd,
+ BuildTransactionStart,
+ BuildTransactionEnd,
+ SyncMessageStart,
+ SyncMessageEnd,
+ SyncTouchEventStart,
+ SyncTouchEventEnd,
- RAFDidUpdateStart,
- RAFDidUpdateEnd,
- RAFBackingStoreFlushStart,
- RAFBackingStoreFlushEnd,
- RAFBuildTransactionStart,
- RAFBuildTransactionEnd,
-
UIProcessRange = 14000,
-
- RAFCommitLayerTreeStart,
- RAFCommitLayerTreeEnd,
- RAFDidRefreshDisplayStart,
- RAFDidRefreshDisplayEnd,
+ CommitLayerTreeStart,
+ CommitLayerTreeEnd,
};
#ifdef __cplusplus
Modified: trunk/Source/WebCore/ChangeLog (214083 => 214084)
--- trunk/Source/WebCore/ChangeLog 2017-03-17 00:23:45 UTC (rev 214083)
+++ trunk/Source/WebCore/ChangeLog 2017-03-17 00:47:16 UTC (rev 214084)
@@ -1,5 +1,37 @@
2017-03-16 Simon Fraser <[email protected]>
+ Improve the system tracing points
+ https://bugs.webkit.org/show_bug.cgi?id=169790
+
+ Reviewed by Zalan Bujtas.
+
+ Use a more cohesive set of system trace points that give a good overview of what
+ WebKit is doing. Added points for resource loading, render tree building, sync messages
+ to the web process, async image decode, WASM and fetching cookies.
+
+ * loader/CookieJar.cpp:
+ (WebCore::cookies):
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::provisionalLoadStarted):
+ (WebCore::FrameLoader::checkLoadCompleteForThisFrame):
+ * loader/SubresourceLoader.cpp:
+ (WebCore::SubresourceLoader::willSendRequestInternal):
+ (WebCore::logResourceLoaded):
+ (WebCore::SubresourceLoader::didFinishLoading):
+ (WebCore::SubresourceLoader::didFail):
+ (WebCore::SubresourceLoader::didCancel):
+ * page/FrameView.cpp:
+ (WebCore::FrameView::paintContents):
+ * platform/graphics/ImageFrameCache.cpp:
+ (WebCore::ImageFrameCache::startAsyncDecodingQueue):
+ * platform/graphics/ios/DisplayRefreshMonitorIOS.mm:
+ (WebCore::DisplayRefreshMonitorIOS::requestRefreshCallback):
+ (WebCore::DisplayRefreshMonitorIOS::displayLinkFired):
+ * style/RenderTreeUpdater.cpp:
+ (WebCore::RenderTreeUpdater::commit):
+
+2017-03-16 Simon Fraser <[email protected]>
+
RenderView::documentBeingDestroyed() needs a new name.
https://bugs.webkit.org/show_bug.cgi?id=166727
Modified: trunk/Source/WebCore/loader/CookieJar.cpp (214083 => 214084)
--- trunk/Source/WebCore/loader/CookieJar.cpp 2017-03-17 00:23:45 UTC (rev 214083)
+++ trunk/Source/WebCore/loader/CookieJar.cpp 2017-03-17 00:47:16 UTC (rev 214084)
@@ -34,6 +34,7 @@
#include "NetworkingContext.h"
#include "PlatformCookieJar.h"
#include "PlatformStrategies.h"
+#include <wtf/SystemTracing.h>
namespace WebCore {
@@ -55,6 +56,8 @@
String cookies(const Document& document, const URL& url)
{
+ TraceScope scope(FetchCookiesStart, FetchCookiesEnd);
+
return platformStrategies()->cookiesStrategy()->cookiesForDOM(storageSession(document), document.firstPartyForCookies(), url);
}
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (214083 => 214084)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2017-03-17 00:23:45 UTC (rev 214083)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2017-03-17 00:47:16 UTC (rev 214084)
@@ -122,6 +122,7 @@
#include <wtf/CurrentTime.h>
#include <wtf/Ref.h>
#include <wtf/StdLibExtras.h>
+#include <wtf/SystemTracing.h>
#include <wtf/text/CString.h>
#include <wtf/text/WTFString.h>
@@ -991,6 +992,8 @@
m_client.provisionalLoadStarted();
if (m_frame.isMainFrame()) {
+ TracePoint(MainResourceLoadDidStartProvisional);
+
if (auto* page = m_frame.page())
page->didStartProvisionalLoad();
}
@@ -2322,8 +2325,10 @@
m_progressTracker->progressCompleted();
Page* page = m_frame.page();
if (page) {
- if (m_frame.isMainFrame())
+ if (m_frame.isMainFrame()) {
+ TracePoint(MainResourceLoadDidEnd);
page->didFinishLoad();
+ }
}
const ResourceError& error = dl->mainDocumentError();
Modified: trunk/Source/WebCore/loader/SubresourceLoader.cpp (214083 => 214084)
--- trunk/Source/WebCore/loader/SubresourceLoader.cpp 2017-03-17 00:23:45 UTC (rev 214083)
+++ trunk/Source/WebCore/loader/SubresourceLoader.cpp 2017-03-17 00:47:16 UTC (rev 214084)
@@ -48,6 +48,7 @@
#include <wtf/Ref.h>
#include <wtf/RefCountedLeakCounter.h>
#include <wtf/StdLibExtras.h>
+#include <wtf/SystemTracing.h>
#include <wtf/text/CString.h>
#if PLATFORM(IOS)
@@ -176,8 +177,10 @@
return;
}
- if (newRequest.requester() != ResourceRequestBase::Requester::Main)
+ if (newRequest.requester() != ResourceRequestBase::Requester::Main) {
+ TracePoint(SubresourceLoadWillStart);
ResourceLoadObserver::sharedObserver().logSubresourceLoading(m_frame.get(), newRequest, redirectResponse);
+ }
ASSERT(!newRequest.isNull());
if (!redirectResponse.isNull()) {
@@ -462,6 +465,7 @@
resourceType = DiagnosticLoggingKeys::otherKey();
break;
}
+
frame->page()->diagnosticLoggingClient().logDiagnosticMessage(DiagnosticLoggingKeys::resourceLoadedKey(), resourceType, ShouldSample::Yes);
}
@@ -552,15 +556,20 @@
}
#endif
+ if (m_resource->type() != CachedResource::MainResource)
+ TracePoint(SubresourceLoadDidEnd);
+
m_state = Finishing;
m_resource->finishLoading(resourceData());
if (wasCancelled())
return;
+
m_resource->finish();
ASSERT(!reachedTerminalState());
didFinishLoadingOnePart(networkLoadMetrics);
notifyDone();
+
if (reachedTerminalState())
return;
releaseResources();
@@ -581,6 +590,10 @@
Ref<SubresourceLoader> protectedThis(*this);
CachedResourceHandle<CachedResource> protectResource(m_resource);
m_state = Finishing;
+
+ if (m_resource->type() != CachedResource::MainResource)
+ TracePoint(SubresourceLoadDidEnd);
+
if (m_resource->resourceToRevalidate())
MemoryCache::singleton().revalidationFailed(*m_resource);
m_resource->setResourceError(error);
@@ -626,6 +639,9 @@
if (m_state == Uninitialized)
return;
+ if (m_resource->type() != CachedResource::MainResource)
+ TracePoint(SubresourceLoadDidEnd);
+
m_resource->cancelLoad();
notifyDone();
}
Modified: trunk/Source/WebCore/page/FrameView.cpp (214083 => 214084)
--- trunk/Source/WebCore/page/FrameView.cpp 2017-03-17 00:23:45 UTC (rev 214083)
+++ trunk/Source/WebCore/page/FrameView.cpp 2017-03-17 00:47:16 UTC (rev 214084)
@@ -4430,8 +4430,6 @@
if (m_layoutPhase == InViewSizeAdjust)
return;
- TraceScope tracingScope(PaintViewStart, PaintViewEnd);
-
ASSERT(m_layoutPhase == InPostLayerPositionsUpdatedAfterLayout || m_layoutPhase == OutsideLayout);
RenderView* renderView = this->renderView();
Modified: trunk/Source/WebCore/platform/graphics/ImageFrameCache.cpp (214083 => 214084)
--- trunk/Source/WebCore/platform/graphics/ImageFrameCache.cpp 2017-03-17 00:23:45 UTC (rev 214083)
+++ trunk/Source/WebCore/platform/graphics/ImageFrameCache.cpp 2017-03-17 00:47:16 UTC (rev 214084)
@@ -28,6 +28,7 @@
#include "Image.h"
#include "ImageObserver.h"
+#include <wtf/SystemTracing.h>
#if USE(CG)
#include "ImageDecoderCG.h"
@@ -294,6 +295,8 @@
ImageFrameRequest frameRequest;
while (m_frameRequestQueue.dequeue(frameRequest)) {
+ TraceScope tracingScope(AsyncImageDecodeStart, AsyncImageDecodeEnd);
+
// Get the frame NativeImage on the decoding thread.
NativeImagePtr nativeImage = protectedDecoder->createFrameImageAtIndex(frameRequest.index, frameRequest.subsamplingLevel, frameRequest.sizeForDrawing);
Modified: trunk/Source/WebCore/platform/graphics/ios/DisplayRefreshMonitorIOS.mm (214083 => 214084)
--- trunk/Source/WebCore/platform/graphics/ios/DisplayRefreshMonitorIOS.mm 2017-03-17 00:23:45 UTC (rev 214083)
+++ trunk/Source/WebCore/platform/graphics/ios/DisplayRefreshMonitorIOS.mm 2017-03-17 00:47:16 UTC (rev 214084)
@@ -32,7 +32,6 @@
#import <QuartzCore/QuartzCore.h>
#import <wtf/CurrentTime.h>
#import <wtf/MainThread.h>
-#import <wtf/SystemTracing.h>
using namespace WebCore;
@@ -100,8 +99,6 @@
if (!isActive())
return false;
- TracePoint(RAFDisplayLinkScheduled);
-
if (!m_handler) {
m_handler = adoptNS([[WebDisplayLinkHandler alloc] initWithMonitor:this]);
setIsActive(true);
@@ -118,8 +115,6 @@
setIsPreviousFrameDone(false);
handleDisplayRefreshedNotificationOnMainThread(this);
-
- TracePoint(RAFDisplayLinkFired);
}
}
Modified: trunk/Source/WebCore/style/RenderTreeUpdater.cpp (214083 => 214084)
--- trunk/Source/WebCore/style/RenderTreeUpdater.cpp 2017-03-17 00:23:45 UTC (rev 214083)
+++ trunk/Source/WebCore/style/RenderTreeUpdater.cpp 2017-03-17 00:47:16 UTC (rev 214084)
@@ -40,6 +40,7 @@
#include "RenderNamedFlowThread.h"
#include "StyleResolver.h"
#include "StyleTreeResolver.h"
+#include <wtf/SystemTracing.h>
#if PLATFORM(IOS)
#include "WKContentObservation.h"
@@ -112,6 +113,8 @@
if (!m_document.shouldCreateRenderers() || !m_document.renderView())
return;
+
+ TraceScope scope(RenderTreeBuildStart, RenderTreeBuildEnd);
Style::PostResolutionCallbackDisabler callbackDisabler(m_document);
Modified: trunk/Source/WebKit/mac/ChangeLog (214083 => 214084)
--- trunk/Source/WebKit/mac/ChangeLog 2017-03-17 00:23:45 UTC (rev 214083)
+++ trunk/Source/WebKit/mac/ChangeLog 2017-03-17 00:47:16 UTC (rev 214084)
@@ -1,3 +1,17 @@
+2017-03-16 Simon Fraser <[email protected]>
+
+ Improve the system tracing points
+ https://bugs.webkit.org/show_bug.cgi?id=169790
+
+ Reviewed by Zalan Bujtas.
+
+ Use a more cohesive set of system trace points that give a good overview of what
+ WebKit is doing. Added points for resource loading, render tree building, sync messages
+ to the web process, async image decode, WASM and fetching cookies.
+
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView drawRect:]):
+
2017-03-16 Youenn Fablet <[email protected]>
Wrap legacy WebRTC API in runtime flag
Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (214083 => 214084)
--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2017-03-17 00:23:45 UTC (rev 214083)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2017-03-17 00:47:16 UTC (rev 214084)
@@ -138,6 +138,7 @@
#import <wtf/MathExtras.h>
#import <wtf/ObjcRuntimeExtras.h>
#import <wtf/RunLoop.h>
+#import <wtf/SystemTracing.h>
#if !PLATFORM(IOS)
#import "WebNSEventExtras.h"
@@ -4194,6 +4195,8 @@
- (void)drawRect:(NSRect)rect
{
LOG(View, "%@ drawing", self);
+
+ TraceScope scope(WebHTMLViewPaintStart, WebHTMLViewPaintEnd);
#if !PLATFORM(IOS)
const NSRect *rects;
Modified: trunk/Source/WebKit2/ChangeLog (214083 => 214084)
--- trunk/Source/WebKit2/ChangeLog 2017-03-17 00:23:45 UTC (rev 214083)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-17 00:47:16 UTC (rev 214084)
@@ -1,3 +1,27 @@
+2017-03-16 Simon Fraser <[email protected]>
+
+ Improve the system tracing points
+ https://bugs.webkit.org/show_bug.cgi?id=169790
+
+ Reviewed by Zalan Bujtas.
+
+ Use a more cohesive set of system trace points that give a good overview of what
+ WebKit is doing. Added points for resource loading, render tree building, sync messages
+ to the web process, async image decode, WASM and fetching cookies.
+
+ * UIProcess/ChildProcessProxy.h:
+ (WebKit::ChildProcessProxy::sendSync):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::handleTouchEventSynchronously):
+ * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::commitLayerTree):
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::didRefreshDisplay):
+ * WebProcess/WebPage/mac/RemoteLayerTreeContext.mm:
+ (WebKit::RemoteLayerTreeContext::buildTransaction):
+ * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
+ (WebKit::RemoteLayerTreeDrawingArea::didUpdate):
+ (WebKit::RemoteLayerTreeDrawingArea::BackingStoreFlusher::flush):
+
2017-03-16 Youenn Fablet <[email protected]>
Wrap legacy WebRTC API in runtime flag
Modified: trunk/Source/WebKit2/UIProcess/ChildProcessProxy.h (214083 => 214084)
--- trunk/Source/WebKit2/UIProcess/ChildProcessProxy.h 2017-03-17 00:23:45 UTC (rev 214083)
+++ trunk/Source/WebKit2/UIProcess/ChildProcessProxy.h 2017-03-17 00:47:16 UTC (rev 214084)
@@ -29,6 +29,7 @@
#include "MessageReceiverMap.h"
#include "ProcessLauncher.h"
+#include <wtf/SystemTracing.h>
#include <wtf/ThreadSafeRefCounted.h>
namespace WebKit {
@@ -117,6 +118,8 @@
if (!m_connection)
return false;
+ TraceScope scope(SyncMessageStart, SyncMessageEnd);
+
return connection()->sendSync(std::forward<U>(message), WTFMove(reply), destinationID, timeout, sendSyncOptions);
}
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (214083 => 214084)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-03-17 00:23:45 UTC (rev 214083)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-03-17 00:47:16 UTC (rev 214084)
@@ -133,6 +133,7 @@
#include <WebCore/WindowFeatures.h>
#include <stdio.h>
#include <wtf/NeverDestroyed.h>
+#include <wtf/SystemTracing.h>
#include <wtf/text/StringBuilder.h>
#include <wtf/text/StringView.h>
@@ -2179,6 +2180,8 @@
if (!isValid())
return;
+ TraceScope scope(SyncTouchEventStart, SyncTouchEventEnd);
+
if (event.type() == WebEvent::TouchStart)
updateTouchEventTracking(event);
Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm (214083 => 214084)
--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2017-03-17 00:23:45 UTC (rev 214083)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2017-03-17 00:47:16 UTC (rev 214084)
@@ -177,7 +177,7 @@
void RemoteLayerTreeDrawingAreaProxy::commitLayerTree(const RemoteLayerTreeTransaction& layerTreeTransaction, const RemoteScrollingCoordinatorTransaction& scrollingTreeTransaction)
{
- TraceScope tracingScope(RAFCommitLayerTreeStart, RAFCommitLayerTreeEnd);
+ TraceScope tracingScope(CommitLayerTreeStart, CommitLayerTreeEnd);
LOG(RemoteLayerTree, "%s", layerTreeTransaction.description().data());
LOG(RemoteLayerTree, "%s", scrollingTreeTransaction.description().data());
@@ -410,8 +410,6 @@
m_didUpdateMessageState = DoesNotNeedDidUpdate;
- TraceScope tracingScope(RAFDidRefreshDisplayStart, RAFDidRefreshDisplayEnd);
-
// Waiting for CA to commit is insufficient, because the render server can still be
// using our backing store. We can improve this by waiting for the render server to commit
// if we find API to do so, but for now we will make extra buffers if need be.
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeContext.mm (214083 => 214084)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeContext.mm 2017-03-17 00:23:45 UTC (rev 214083)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeContext.mm 2017-03-17 00:47:16 UTC (rev 214084)
@@ -107,7 +107,7 @@
void RemoteLayerTreeContext::buildTransaction(RemoteLayerTreeTransaction& transaction, PlatformCALayer& rootLayer)
{
- TraceScope tracingScope(RAFBuildTransactionStart, RAFBuildTransactionEnd);
+ TraceScope tracingScope(BuildTransactionStart, BuildTransactionEnd);
PlatformCALayerRemote& rootLayerRemote = downcast<PlatformCALayerRemote>(rootLayer);
transaction.setRootLayerID(rootLayerRemote.layerID());
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (214083 => 214084)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2017-03-17 00:23:45 UTC (rev 214083)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2017-03-17 00:47:16 UTC (rev 214084)
@@ -437,8 +437,6 @@
void RemoteLayerTreeDrawingArea::didUpdate()
{
- TraceScope tracingScope(RAFDidUpdateStart, RAFDidUpdateEnd);
-
// FIXME: This should use a counted replacement for setLayerTreeStateIsFrozen, but
// the callers of that function are not strictly paired.
@@ -488,7 +486,7 @@
{
ASSERT(!m_hasFlushed);
- TraceScope tracingScope(RAFBackingStoreFlushStart, RAFBackingStoreFlushEnd);
+ TraceScope tracingScope(BackingStoreFlushStart, BackingStoreFlushEnd);
for (auto& context : m_contextsToFlush)
CGContextFlush(context.get());
Modified: trunk/Tools/ChangeLog (214083 => 214084)
--- trunk/Tools/ChangeLog 2017-03-17 00:23:45 UTC (rev 214083)
+++ trunk/Tools/ChangeLog 2017-03-17 00:47:16 UTC (rev 214084)
@@ -1,3 +1,16 @@
+2017-03-16 Simon Fraser <[email protected]>
+
+ Improve the system tracing points
+ https://bugs.webkit.org/show_bug.cgi?id=169790
+
+ Reviewed by Zalan Bujtas.
+
+ Use a more cohesive set of system trace points that give a good overview of what
+ WebKit is doing. Added points for resource loading, render tree building, sync messages
+ to the web process, async image decode, WASM and fetching cookies.
+
+ * Tracing/SystemTracePoints.plist:
+
2017-03-16 Youenn Fablet <[email protected]>
Wrap legacy WebRTC API in runtime flag
Modified: trunk/Tools/Tracing/SystemTracePoints.plist (214083 => 214084)
--- trunk/Tools/Tracing/SystemTracePoints.plist 2017-03-17 00:23:45 UTC (rev 214083)
+++ trunk/Tools/Tracing/SystemTracePoints.plist 2017-03-17 00:47:16 UTC (rev 214084)
@@ -21,12 +21,36 @@
</dict>
<dict>
<key>Name</key>
- <string>Document::recalcStyle()</string>
+ <string>Compile WebAssembly</string>
<key>Type</key>
<string>Interval</string>
<key>Component</key>
<string>47</string>
<key>CodeBegin</key>
+ <string>2503</string>
+ <key>CodeEnd</key>
+ <string>2504</string>
+ </dict>
+ <dict>
+ <key>Name</key>
+ <string>Execute WebAssembly</string>
+ <key>Type</key>
+ <string>Interval</string>
+ <key>Component</key>
+ <string>47</string>
+ <key>CodeBegin</key>
+ <string>2505</string>
+ <key>CodeEnd</key>
+ <string>2506</string>
+ </dict>
+ <dict>
+ <key>Name</key>
+ <string>Main Resource Load</string>
+ <key>Type</key>
+ <string>Interval</string>
+ <key>Component</key>
+ <string>47</string>
+ <key>CodeBegin</key>
<string>5001</string>
<key>CodeEnd</key>
<string>5002</string>
@@ -33,7 +57,7 @@
</dict>
<dict>
<key>Name</key>
- <string>FrameView::layout()</string>
+ <string>Subresource Load</string>
<key>Type</key>
<string>Interval</string>
<key>Component</key>
@@ -45,7 +69,7 @@
</dict>
<dict>
<key>Name</key>
- <string>FrameView::paintContents()</string>
+ <string>Fetch Cookies</string>
<key>Type</key>
<string>Interval</string>
<key>Component</key>
@@ -57,7 +81,7 @@
</dict>
<dict>
<key>Name</key>
- <string>GraphicsLayerCA::paintLayerContents()</string>
+ <string>Style recalc</string>
<key>Type</key>
<string>Interval</string>
<key>Component</key>
@@ -69,7 +93,7 @@
</dict>
<dict>
<key>Name</key>
- <string>DisplayRefreshMonitor</string>
+ <string>Build render tree</string>
<key>Type</key>
<string>Interval</string>
<key>Component</key>
@@ -81,7 +105,7 @@
</dict>
<dict>
<key>Name</key>
- <string>ScriptedAnimationController::serviceScriptedAnimations()</string>
+ <string>Layout</string>
<key>Type</key>
<string>Interval</string>
<key>Component</key>
@@ -93,12 +117,60 @@
</dict>
<dict>
<key>Name</key>
- <string>RemoteLayerTreeDrawingArea::didUpdate()</string>
+ <string>Paint layer</string>
<key>Type</key>
<string>Interval</string>
<key>Component</key>
<string>47</string>
<key>CodeBegin</key>
+ <string>5013</string>
+ <key>CodeEnd</key>
+ <string>5014</string>
+ </dict>
+ <dict>
+ <key>Name</key>
+ <string>Async Image Decode</string>
+ <key>Type</key>
+ <string>Interval</string>
+ <key>Component</key>
+ <string>47</string>
+ <key>CodeBegin</key>
+ <string>5015</string>
+ <key>CodeEnd</key>
+ <string>5016</string>
+ </dict>
+ <dict>
+ <key>Name</key>
+ <string>requestAnimationFrame</string>
+ <key>Type</key>
+ <string>Interval</string>
+ <key>Component</key>
+ <string>47</string>
+ <key>CodeBegin</key>
+ <string>5017</string>
+ <key>CodeEnd</key>
+ <string>5018</string>
+ </dict>
+ <dict>
+ <key>Name</key>
+ <string>Paint WebHTMLView</string>
+ <key>Type</key>
+ <string>Interval</string>
+ <key>Component</key>
+ <string>47</string>
+ <key>CodeBegin</key>
+ <string>10001</string>
+ <key>CodeEnd</key>
+ <string>10002</string>
+ </dict>
+ <dict>
+ <key>Name</key>
+ <string>Flush backing store drawing</string>
+ <key>Type</key>
+ <string>Interval</string>
+ <key>Component</key>
+ <string>47</string>
+ <key>CodeBegin</key>
<string>12001</string>
<key>CodeEnd</key>
<string>12002</string>
@@ -105,7 +177,7 @@
</dict>
<dict>
<key>Name</key>
- <string>RemoteLayerTreeDrawingArea::BackingStoreFlusher::flush()</string>
+ <string>Build RemoteLayerTree transaction</string>
<key>Type</key>
<string>Interval</string>
<key>Component</key>
@@ -117,7 +189,7 @@
</dict>
<dict>
<key>Name</key>
- <string>RemoteLayerTreeContext::buildTransaction()</string>
+ <string>Sync message</string>
<key>Type</key>
<string>Interval</string>
<key>Component</key>
@@ -129,27 +201,27 @@
</dict>
<dict>
<key>Name</key>
- <string>RemoteLayerTreeDrawingAreaProxy::commitLayerTree()</string>
+ <string>Sync touch event</string>
<key>Type</key>
<string>Interval</string>
<key>Component</key>
<string>47</string>
<key>CodeBegin</key>
- <string>14001</string>
+ <string>12007</string>
<key>CodeEnd</key>
- <string>14002</string>
+ <string>12008</string>
</dict>
<dict>
<key>Name</key>
- <string>RemoteLayerTreeDrawingAreaProxy::didRefreshDisplay()</string>
+ <string>Commit RemoteLayerTree transaction</string>
<key>Type</key>
<string>Interval</string>
<key>Component</key>
<string>47</string>
<key>CodeBegin</key>
- <string>14003</string>
+ <string>14001</string>
<key>CodeEnd</key>
- <string>14004</string>
+ <string>14002</string>
</dict>
</array>
</dict>
