Diff
Modified: trunk/ChangeLog (211630 => 211631)
--- trunk/ChangeLog 2017-02-03 12:56:20 UTC (rev 211630)
+++ trunk/ChangeLog 2017-02-03 13:03:33 UTC (rev 211631)
@@ -1,3 +1,14 @@
+2017-02-03 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [GTK] Add initial implementation of resource usage overlay
+ https://bugs.webkit.org/show_bug.cgi?id=167731
+
+ Reviewed by Michael Catanzaro.
+
+ Enable RESOURCE_USAGE.
+
+ * Source/cmake/OptionsGTK.cmake:
+
2017-02-02 Alex Christensen <achristen...@webkit.org>
Build fix after r211602
Modified: trunk/LayoutTests/ChangeLog (211630 => 211631)
--- trunk/LayoutTests/ChangeLog 2017-02-03 12:56:20 UTC (rev 211630)
+++ trunk/LayoutTests/ChangeLog 2017-02-03 13:03:33 UTC (rev 211631)
@@ -1,3 +1,14 @@
+2017-02-03 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [GTK] Add initial implementation of resource usage overlay
+ https://bugs.webkit.org/show_bug.cgi?id=167731
+
+ Reviewed by Michael Catanzaro.
+
+ Unskip inpector tests depending on RESOURCE_USAGE.
+
+ * platform/gtk/TestExpectations:
+
2017-02-03 Antoine Quint <grao...@apple.com>
LayoutTest media/modern-media-controls/tracks-panel/tracks-panel-hide-click-outside.html is a flaky timeout
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (211630 => 211631)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2017-02-03 12:56:20 UTC (rev 211630)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2017-02-03 13:03:33 UTC (rev 211631)
@@ -644,9 +644,6 @@
# Requires ENABLE(SAMPLING_PROFILER)
webkit.org/b/153466 inspector/sampling-profiler [ Skip ]
-# Requires ENABLE(RESOURCE_USAGE).
-inspector/memory [ Skip ]
-
# This requires a specific font on Mac
fast/text/hidpi-text-selection-gap-between-words.html [ Skip ]
Modified: trunk/Source/_javascript_Core/ChangeLog (211630 => 211631)
--- trunk/Source/_javascript_Core/ChangeLog 2017-02-03 12:56:20 UTC (rev 211630)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-02-03 13:03:33 UTC (rev 211631)
@@ -1,3 +1,17 @@
+2017-02-03 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [GTK] Add initial implementation of resource usage overlay
+ https://bugs.webkit.org/show_bug.cgi?id=167731
+
+ Reviewed by Michael Catanzaro.
+
+ Also expose nextFireTime() for GTK+ port.
+
+ * heap/GCActivityCallback.cpp:
+ (JSC::GCActivityCallback::scheduleTimer):
+ (JSC::GCActivityCallback::cancelTimer):
+ * heap/GCActivityCallback.h:
+
2017-02-03 Csaba Osztrogonác <o...@webkit.org>
[cmake] Unreviewed AArch64 buildfix after r211603.
Modified: trunk/Source/_javascript_Core/heap/GCActivityCallback.cpp (211630 => 211631)
--- trunk/Source/_javascript_Core/heap/GCActivityCallback.cpp 2017-02-03 12:56:20 UTC (rev 211630)
+++ trunk/Source/_javascript_Core/heap/GCActivityCallback.cpp 2017-02-03 13:03:33 UTC (rev 211631)
@@ -123,6 +123,7 @@
return;
m_delay = newDelay;
+ m_nextFireTime = WTF::currentTime() + newDelay;
if (!m_delay) {
g_source_set_ready_time(m_timer.get(), 0);
return;
@@ -141,6 +142,7 @@
void GCActivityCallback::cancelTimer()
{
m_delay = -1;
+ m_nextFireTime = 0;
g_source_set_ready_time(m_timer.get(), -1);
}
#endif
Modified: trunk/Source/_javascript_Core/heap/GCActivityCallback.h (211630 => 211631)
--- trunk/Source/_javascript_Core/heap/GCActivityCallback.h 2017-02-03 12:56:20 UTC (rev 211630)
+++ trunk/Source/_javascript_Core/heap/GCActivityCallback.h 2017-02-03 13:03:33 UTC (rev 211631)
@@ -59,7 +59,7 @@
static bool s_shouldCreateGCTimer;
-#if USE(CF) || PLATFORM(EFL)
+#if USE(CF) || USE(GLIB)
double nextFireTime() const { return m_nextFireTime; }
#endif
Modified: trunk/Source/WTF/ChangeLog (211630 => 211631)
--- trunk/Source/WTF/ChangeLog 2017-02-03 12:56:20 UTC (rev 211630)
+++ trunk/Source/WTF/ChangeLog 2017-02-03 13:03:33 UTC (rev 211631)
@@ -1,3 +1,14 @@
+2017-02-03 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [GTK] Add initial implementation of resource usage overlay
+ https://bugs.webkit.org/show_bug.cgi?id=167731
+
+ Reviewed by Michael Catanzaro.
+
+ Enable RESOURCE_USAGE for GTK+ port too.
+
+ * wtf/Platform.h:
+
2017-02-02 Andreas Kling <akl...@apple.com>
[Mac] In-process memory pressure monitor for WebContent processes AKA websam
Modified: trunk/Source/WTF/wtf/Platform.h (211630 => 211631)
--- trunk/Source/WTF/wtf/Platform.h 2017-02-03 12:56:20 UTC (rev 211630)
+++ trunk/Source/WTF/wtf/Platform.h 2017-02-03 13:03:33 UTC (rev 211631)
@@ -1110,7 +1110,7 @@
#define USE_IOSURFACE 1
#endif
-#if PLATFORM(COCOA)
+#if PLATFORM(COCOA) || PLATFORM(GTK)
#define ENABLE_RESOURCE_USAGE 1
#endif
Modified: trunk/Source/WebCore/ChangeLog (211630 => 211631)
--- trunk/Source/WebCore/ChangeLog 2017-02-03 12:56:20 UTC (rev 211630)
+++ trunk/Source/WebCore/ChangeLog 2017-02-03 13:03:33 UTC (rev 211631)
@@ -1,3 +1,28 @@
+2017-02-03 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [GTK] Add initial implementation of resource usage overlay
+ https://bugs.webkit.org/show_bug.cgi?id=167731
+
+ Reviewed by Michael Catanzaro.
+
+ Add an implementation of ResourceUsageOverlay and ResourceUsageThread for Linux systems.
+
+ * PlatformGTK.cmake: Add new new files to compilation.
+ * page/Page.cpp:
+ (WebCore::Page::setResourceUsageOverlayVisible): Do not create the page overlay if accelerated compositing is
+ not enabled.
+ * page/ResourceUsageOverlay.h:
+ * page/linux/ResourceUsageOverlayLinux.cpp: Added.
+ (WebCore::cpuUsageString):
+ (WebCore::formatByteNumber):
+ (WebCore::gcTimerString):
+ (WebCore::ResourceUsageOverlay::platformInitialize):
+ (WebCore::ResourceUsageOverlay::platformDestroy):
+ * page/linux/ResourceUsageThreadLinux.cpp: Added.
+ (WebCore::cpuPeriod):
+ (WebCore::cpuUsage):
+ (WebCore::ResourceUsageThread::platformThreadBody):
+
2017-02-03 Enrique Ocaña González <eoca...@igalia.com>
[GStreamer] Store preloaded media in webkit's cache
Modified: trunk/Source/WebCore/PlatformGTK.cmake (211630 => 211631)
--- trunk/Source/WebCore/PlatformGTK.cmake 2017-02-03 12:56:20 UTC (rev 211630)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2017-02-03 13:03:33 UTC (rev 211631)
@@ -62,6 +62,9 @@
loader/soup/CachedRawResourceSoup.cpp
loader/soup/SubresourceLoaderSoup.cpp
+ page/linux/ResourceUsageOverlayLinux.cpp
+ page/linux/ResourceUsageThreadLinux.cpp
+
platform/KillRingNone.cpp
platform/StaticPasteboard.cpp
platform/UserAgentQuirks.cpp
Modified: trunk/Source/WebCore/page/Page.cpp (211630 => 211631)
--- trunk/Source/WebCore/page/Page.cpp 2017-02-03 12:56:20 UTC (rev 211630)
+++ trunk/Source/WebCore/page/Page.cpp 2017-02-03 13:03:33 UTC (rev 211631)
@@ -2146,7 +2146,7 @@
return;
}
- if (!m_resourceUsageOverlay)
+ if (!m_resourceUsageOverlay && m_settings->acceleratedCompositingEnabled())
m_resourceUsageOverlay = std::make_unique<ResourceUsageOverlay>(*this);
}
#endif
Modified: trunk/Source/WebCore/page/ResourceUsageOverlay.h (211630 => 211631)
--- trunk/Source/WebCore/page/ResourceUsageOverlay.h 2017-02-03 12:56:20 UTC (rev 211630)
+++ trunk/Source/WebCore/page/ResourceUsageOverlay.h 2017-02-03 13:03:33 UTC (rev 211631)
@@ -28,6 +28,7 @@
#if ENABLE(RESOURCE_USAGE)
#include "FloatRect.h"
+#include "GraphicsLayer.h"
#include "IntRect.h"
#include "MainFrame.h"
#include "PageOverlay.h"
@@ -82,6 +83,11 @@
RetainPtr<CALayer> m_layer;
RetainPtr<CALayer> m_containerLayer;
#endif
+
+#if OS(LINUX)
+ std::unique_ptr<GraphicsLayer> m_paintLayer;
+ std::unique_ptr<GraphicsLayerClient> m_overlayPainter;
+#endif
};
} // namespace WebCore
Modified: trunk/Source/WebCore/page/ResourceUsageThread.h (211630 => 211631)
--- trunk/Source/WebCore/page/ResourceUsageThread.h 2017-02-03 12:56:20 UTC (rev 211630)
+++ trunk/Source/WebCore/page/ResourceUsageThread.h 2017-02-03 13:03:33 UTC (rev 211631)
@@ -25,7 +25,7 @@
#pragma once
-#if ENABLE(RESOURCE_USAGE)
+#if ENABLE(RESOURCE_USAGE) && OS(LINUX)
#include "ResourceUsageData.h"
#include <array>
@@ -87,4 +87,4 @@
} // namespace WebCore
-#endif // ENABLE(RESOURCE_USAGE)
+#endif // ENABLE(RESOURCE_USAGE) && OS(LINUX)
Added: trunk/Source/WebCore/page/linux/ResourceUsageOverlayLinux.cpp (0 => 211631)
--- trunk/Source/WebCore/page/linux/ResourceUsageOverlayLinux.cpp (rev 0)
+++ trunk/Source/WebCore/page/linux/ResourceUsageOverlayLinux.cpp 2017-02-03 13:03:33 UTC (rev 211631)
@@ -0,0 +1,163 @@
+/*
+ * Copyright (C) 2017 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "ResourceUsageOverlay.h"
+
+#if ENABLE(RESOURCE_USAGE) && OS(LINUX)
+
+#include "Chrome.h"
+#include "ChromeClient.h"
+#include "CommonVM.h"
+#include "GraphicsContext.h"
+#include "Page.h"
+#include "RenderTheme.h"
+#include "ResourceUsageThread.h"
+#include <runtime/VM.h>
+
+namespace WebCore {
+
+static ResourceUsageData gData;
+
+static String cpuUsageString(float cpuUsage)
+{
+ if (cpuUsage < 0)
+ return ASCIILiteral("<unknown>");
+ return String::format("%.1f%%", cpuUsage);
+}
+
+static String formatByteNumber(size_t number)
+{
+ if (number >= 1024 * 1048576)
+ return String::format("%.3f GB", static_cast<double>(number) / (1024 * 1048576));
+ if (number >= 1048576)
+ return String::format("%.2f MB", static_cast<double>(number) / 1048576);
+ if (number >= 1024)
+ return String::format("%.1f kB", static_cast<double>(number) / 1024);
+ return String::format("%lu", number);
+}
+
+static String gcTimerString(double timerFireDate, double now)
+{
+ if (!timerFireDate)
+ return ASCIILiteral("[not scheduled]");
+ return String::format("%g", timerFireDate - now);
+}
+
+static const float gFontSize = 14;
+
+class ResourceUsageOverlayPainter final : public GraphicsLayerClient {
+public:
+ ResourceUsageOverlayPainter(ResourceUsageOverlay& overlay)
+ : m_overlay(overlay)
+ {
+ FontCascadeDescription fontDescription;
+ RenderTheme::defaultTheme()->systemFont(CSSValueMessageBox, fontDescription);
+ fontDescription.setComputedSize(gFontSize);
+ m_textFont = FontCascade(fontDescription, 0, 0);
+ m_textFont.update(nullptr);
+ }
+
+ ~ResourceUsageOverlayPainter()
+ {
+ }
+
+private:
+ void paintContents(const GraphicsLayer*, GraphicsContext& context, GraphicsLayerPaintingPhase, const FloatRect& clip) override
+ {
+ GraphicsContextStateSaver stateSaver(context);
+ context.fillRect(clip, Color(0.0f, 0.0f, 0.0f, 0.8f));
+ context.setFillColor(Color(0.9f, 0.9f, 0.9f, 1.f));
+
+ FloatPoint position = { 10, 20 };
+ String string = "CPU: " + cpuUsageString(gData.cpu);
+ context.drawText(m_textFont, TextRun(string), position);
+ position.move(0, gFontSize + 2);
+
+ string = "Memory: " + formatByteNumber(gData.totalDirtySize);
+ context.drawText(m_textFont, TextRun(string), position);
+ position.move(0, gFontSize + 2);
+
+ string = "External: " + formatByteNumber(gData.totalExternalSize);
+ context.drawText(m_textFont, TextRun(string), position);
+ position.move(0, gFontSize + 2);
+
+ string = "GC Heap: " + formatByteNumber(gData.categories[MemoryCategory::GCHeap].dirtySize);
+ context.drawText(m_textFont, TextRun(string), position);
+ position.move(0, gFontSize + 2);
+
+ string = "GC owned: " + formatByteNumber(gData.categories[MemoryCategory::GCOwned].dirtySize);
+ context.drawText(m_textFont, TextRun(string), position);
+ position.move(0, gFontSize + 2);
+
+ double now = WTF::currentTime();
+ string = "Eden GC: " + gcTimerString(gData.timeOfNextEdenCollection, now);
+ context.drawText(m_textFont, TextRun(string), position);
+ position.move(0, gFontSize + 2);
+
+ string = "Full GC: " + gcTimerString(gData.timeOfNextFullCollection, now);
+ context.drawText(m_textFont, TextRun(string), position);
+ position.move(0, gFontSize + 2);
+ }
+
+ void notifyFlushRequired(const GraphicsLayer*) override
+ {
+ m_overlay.overlay().page()->chrome().client().scheduleCompositingLayerFlush();
+ }
+
+ ResourceUsageOverlay& m_overlay;
+ FontCascade m_textFont;
+};
+
+void ResourceUsageOverlay::platformInitialize()
+{
+ m_overlayPainter = std::make_unique<ResourceUsageOverlayPainter>(*this);
+ m_paintLayer = GraphicsLayer::create(overlay().page()->chrome().client().graphicsLayerFactory(), *m_overlayPainter);
+ m_paintLayer->setAnchorPoint(FloatPoint3D());
+ m_paintLayer->setSize({ normalWidth, normalHeight });
+ m_paintLayer->setBackgroundColor(Color(0.0f, 0.0f, 0.0f, 0.8f));
+ m_paintLayer->setDrawsContent(true);
+ overlay().layer().addChild(m_paintLayer.get());
+
+ ResourceUsageThread::addObserver(this, [this] (const ResourceUsageData& data) {
+ gData = data;
+ m_paintLayer->setNeedsDisplay();
+ });
+}
+
+void ResourceUsageOverlay::platformDestroy()
+{
+ ResourceUsageThread::removeObserver(this);
+ if (!m_paintLayer)
+ return;
+
+ m_paintLayer->removeFromParent();
+ m_paintLayer = nullptr;
+ m_overlayPainter = nullptr;
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(RESOURCE_USAGE) && OS(LINUX)
Added: trunk/Source/WebCore/page/linux/ResourceUsageThreadLinux.cpp (0 => 211631)
--- trunk/Source/WebCore/page/linux/ResourceUsageThreadLinux.cpp (rev 0)
+++ trunk/Source/WebCore/page/linux/ResourceUsageThreadLinux.cpp 2017-02-03 13:03:33 UTC (rev 211631)
@@ -0,0 +1,171 @@
+/*
+ * Copyright (C) 2017 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "ResourceUsageThread.h"
+
+#if ENABLE(RESOURCE_USAGE)
+
+#include "CurrentProcessMemoryStatus.h"
+#include <errno.h>
+#include <fcntl.h>
+#include <heap/GCActivityCallback.h>
+#include <runtime/VM.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+namespace WebCore {
+
+static float cpuPeriod()
+{
+ FILE* file = fopen("/proc/stat", "r");
+ if (!file)
+ return 0;
+
+ static const unsigned statMaxLineLength = 512;
+ char buffer[statMaxLineLength + 1];
+ char* line = fgets(buffer, statMaxLineLength, file);
+ if (!line) {
+ fclose(file);
+ return 0;
+ }
+
+ unsigned long long userTime, niceTime, systemTime, idleTime;
+ unsigned long long ioWait, irq, softIrq, steal, guest, guestnice;
+ ioWait = irq = softIrq = steal = guest = guestnice = 0;
+ sscanf(buffer, "cpu %16llu %16llu %16llu %16llu %16llu %16llu %16llu %16llu %16llu %16llu",
+ &userTime, &niceTime, &systemTime, &idleTime, &ioWait, &irq, &softIrq, &steal, &guest, &guestnice);
+
+ // Keep parsing if we still don't know cpuCount.
+ static unsigned cpuCount = 0;
+ if (!cpuCount) {
+ while ((line = fgets(buffer, statMaxLineLength, file))) {
+ if (strlen(line) > 4 && line[0] == 'c' && line[1] == 'p' && line[2] == 'u')
+ cpuCount++;
+ else
+ break;
+ }
+ }
+ fclose(file);
+
+ if (!cpuCount)
+ return 0;
+
+ static unsigned long long previousTotalTime = 0;
+ unsigned long long totalTime = userTime + niceTime + systemTime + irq + softIrq + idleTime + ioWait + steal;
+ unsigned long long period = totalTime > previousTotalTime ? totalTime - previousTotalTime : 0;
+ previousTotalTime = totalTime;
+ return static_cast<float>(period) / cpuCount;
+}
+
+static float cpuUsage()
+{
+ float period = cpuPeriod();
+ if (!period)
+ return -1;
+
+ int fd = open("/proc/self/stat", O_RDONLY);
+ if (fd < 0)
+ return -1;
+
+ static const ssize_t maxBufferLength = BUFSIZ - 1;
+ char buffer[BUFSIZ];
+ buffer[0] = '\0';
+
+ ssize_t totalBytesRead = 0;
+ while (totalBytesRead < maxBufferLength) {
+ ssize_t bytesRead = read(fd, buffer + totalBytesRead, maxBufferLength - totalBytesRead);
+ if (bytesRead < 0) {
+ if (errno != EINTR) {
+ close(fd);
+ return -1;
+ }
+ continue;
+ }
+
+ if (!bytesRead)
+ break;
+
+ totalBytesRead += bytesRead;
+ }
+ close(fd);
+ buffer[totalBytesRead] = '\0';
+
+ // Skip pid and process name.
+ char* position = strrchr(buffer, ')');
+ if (!position)
+ return -1;
+
+ // Move after state.
+ position += 4;
+
+ // Skip ppid, pgrp, sid, tty_nr, tty_pgrp, flags, min_flt, cmin_flt, maj_flt, cmaj_flt.
+ unsigned tokensToSkip = 10;
+ while (tokensToSkip--) {
+ while (!isASCIISpace(position[0]))
+ position++;
+ position++;
+ }
+
+ static unsigned long long previousUtime = 0;
+ static unsigned long long previousStime = 0;
+ unsigned long long utime = strtoull(position, &position, 10);
+ unsigned long long stime = strtoull(position, &position, 10);
+ float usage = (utime + stime - (previousUtime + previousStime)) / period * 100.0;
+ previousUtime = utime;
+ previousStime = stime;
+
+ return clampTo<float>(usage, 0, 100);
+}
+
+void ResourceUsageThread::platformThreadBody(JSC::VM* vm, ResourceUsageData& data)
+{
+ data.cpu = cpuUsage();
+
+ ProcessMemoryStatus memoryStatus;
+ currentProcessMemoryStatus(memoryStatus);
+ data.totalDirtySize = memoryStatus.resident - memoryStatus.shared;
+
+ size_t currentGCHeapCapacity = vm->heap.blockBytesAllocated();
+ size_t currentGCOwnedExtra = vm->heap.extraMemorySize();
+ size_t currentGCOwnedExternal = vm->heap.externalMemorySize();
+ RELEASE_ASSERT(currentGCOwnedExternal <= currentGCOwnedExtra);
+
+ data.categories[MemoryCategory::GCHeap].dirtySize = currentGCHeapCapacity;
+ data.categories[MemoryCategory::GCOwned].dirtySize = currentGCOwnedExtra - currentGCOwnedExternal;
+ data.categories[MemoryCategory::GCOwned].externalSize = currentGCOwnedExternal;
+
+ data.totalExternalSize = currentGCOwnedExternal;
+
+ data.timeOfNextEdenCollection = vm->heap.edenActivityCallback()->nextFireTime();
+ data.timeOfNextFullCollection = vm->heap.fullActivityCallback()->nextFireTime();
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(RESOURCE_USAGE)
Modified: trunk/Source/WebKit2/ChangeLog (211630 => 211631)
--- trunk/Source/WebKit2/ChangeLog 2017-02-03 12:56:20 UTC (rev 211630)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-03 13:03:33 UTC (rev 211631)
@@ -1,5 +1,18 @@
2017-02-03 Carlos Garcia Campos <cgar...@igalia.com>
+ [GTK] Add initial implementation of resource usage overlay
+ https://bugs.webkit.org/show_bug.cgi?id=167731
+
+ Reviewed by Michael Catanzaro.
+
+ Toggle the resource usage overlay visibility by pressing CTRL + Shift + G. Only available when building with
+ developer mode enabled.
+
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseKeyPressEvent):
+
+2017-02-03 Carlos Garcia Campos <cgar...@igalia.com>
+
REGRESSION(r211486) [GTK] The MiniBrowser doesn't work anymore.
https://bugs.webkit.org/show_bug.cgi?id=167776
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (211630 => 211631)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2017-02-03 12:56:20 UTC (rev 211630)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2017-02-03 13:03:33 UTC (rev 211631)
@@ -683,6 +683,15 @@
WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(widget);
WebKitWebViewBasePrivate* priv = webViewBase->priv;
+#if ENABLE(DEVELOPER_MODE) && OS(LINUX)
+ if ((keyEvent->state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) && keyEvent->keyval == GDK_KEY_G) {
+ auto& preferences = priv->pageProxy->preferences();
+ preferences.setResourceUsageOverlayVisible(!preferences.resourceUsageOverlayVisible());
+ priv->shouldForwardNextKeyEvent = FALSE;
+ return TRUE;
+ }
+#endif
+
if (priv->authenticationDialog)
return GTK_WIDGET_CLASS(webkit_web_view_base_parent_class)->key_press_event(widget, keyEvent);
Modified: trunk/Source/cmake/OptionsGTK.cmake (211630 => 211631)
--- trunk/Source/cmake/OptionsGTK.cmake 2017-02-03 12:56:20 UTC (rev 211630)
+++ trunk/Source/cmake/OptionsGTK.cmake 2017-02-03 13:03:33 UTC (rev 211631)
@@ -171,6 +171,7 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NOTIFICATIONS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PUBLIC_SUFFIX_LIST PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOURCE_USAGE PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SMOOTH_SCROLLING PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USERSELECT_ALL PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USER_MESSAGE_HANDLERS PRIVATE ON)
