Commit bb331f59 authored by Sebastien Marchand's avatar Sebastien Marchand Committed by Commit Bot

Add some debug URLs to simulate memory pressure

This adds the following debug URLS:
  - chrome://memory-pressure-critical/
  - chrome://memory-pressure-moderate/

These URLs will be useful to improve our memory pressure handlers.

Change-Id: I70e709c57a19661f7c268128e467fd93f87034a8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1940748Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Reviewed-by: default avatarMatt Falkenhagen <falken@chromium.org>
Commit-Queue: Sébastien Marchand <sebmarchand@chromium.org>
Auto-Submit: Sébastien Marchand <sebmarchand@chromium.org>
Cr-Commit-Position: refs/heads/master@{#721543}
parent bf25f3be
...@@ -639,6 +639,8 @@ const char* const kChromeDebugURLs[] = { ...@@ -639,6 +639,8 @@ const char* const kChromeDebugURLs[] = {
content::kChromeUIGpuCrashURL, content::kChromeUIGpuCrashURL,
content::kChromeUIGpuHangURL, content::kChromeUIGpuHangURL,
content::kChromeUIMemoryExhaustURL, content::kChromeUIMemoryExhaustURL,
content::kChromeUIMemoryPressureCriticalURL,
content::kChromeUIMemoryPressureModerateURL,
content::kChromeUIPpapiFlashCrashURL, content::kChromeUIPpapiFlashCrashURL,
content::kChromeUIPpapiFlashHangURL, content::kChromeUIPpapiFlashHangURL,
#if defined(OS_WIN) #if defined(OS_WIN)
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "base/command_line.h" #include "base/command_line.h"
#include "base/debug/asan_invalid_access.h" #include "base/debug/asan_invalid_access.h"
#include "base/debug/profiler.h" #include "base/debug/profiler.h"
#include "base/memory/memory_pressure_listener.h"
#include "base/sanitizer_buildflags.h" #include "base/sanitizer_buildflags.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "base/synchronization/waitable_event.h" #include "base/synchronization/waitable_event.h"
...@@ -219,6 +220,18 @@ bool HandleDebugURL(const GURL& url, ...@@ -219,6 +220,18 @@ bool HandleDebugURL(const GURL& url,
return true; return true;
} }
if (url == kChromeUIMemoryPressureCriticalURL) {
base::MemoryPressureListener::NotifyMemoryPressure(
base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_CRITICAL);
return true;
}
if (url == kChromeUIMemoryPressureModerateURL) {
base::MemoryPressureListener::NotifyMemoryPressure(
base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_MODERATE);
return true;
}
return false; return false;
} }
......
...@@ -49,6 +49,10 @@ const char kChromeUIGpuHangURL[] = "chrome://gpuhang/"; ...@@ -49,6 +49,10 @@ const char kChromeUIGpuHangURL[] = "chrome://gpuhang/";
const char kChromeUIHangURL[] = "chrome://hang/"; const char kChromeUIHangURL[] = "chrome://hang/";
const char kChromeUIKillURL[] = "chrome://kill/"; const char kChromeUIKillURL[] = "chrome://kill/";
const char kChromeUIMemoryExhaustURL[] = "chrome://memory-exhaust/"; const char kChromeUIMemoryExhaustURL[] = "chrome://memory-exhaust/";
const char kChromeUIMemoryPressureCriticalURL[] =
"chrome://memory-pressure-critical/";
const char kChromeUIMemoryPressureModerateURL[] =
"chrome://memory-pressure-moderate/";
const char kChromeUINetworkErrorURL[] = "chrome://network-error/"; const char kChromeUINetworkErrorURL[] = "chrome://network-error/";
const char kChromeUINetworkErrorsListingURL[] = "chrome://network-errors/"; const char kChromeUINetworkErrorsListingURL[] = "chrome://network-errors/";
const char kChromeUIPpapiFlashCrashURL[] = "chrome://ppapiflashcrash/"; const char kChromeUIPpapiFlashCrashURL[] = "chrome://ppapiflashcrash/";
......
...@@ -62,6 +62,8 @@ CONTENT_EXPORT extern const char kChromeUIGpuHangURL[]; ...@@ -62,6 +62,8 @@ CONTENT_EXPORT extern const char kChromeUIGpuHangURL[];
CONTENT_EXPORT extern const char kChromeUIHangURL[]; CONTENT_EXPORT extern const char kChromeUIHangURL[];
CONTENT_EXPORT extern const char kChromeUIKillURL[]; CONTENT_EXPORT extern const char kChromeUIKillURL[];
CONTENT_EXPORT extern const char kChromeUIMemoryExhaustURL[]; CONTENT_EXPORT extern const char kChromeUIMemoryExhaustURL[];
CONTENT_EXPORT extern const char kChromeUIMemoryPressureCriticalURL[];
CONTENT_EXPORT extern const char kChromeUIMemoryPressureModerateURL[];
CONTENT_EXPORT extern const char kChromeUINetworkErrorsListingURL[]; CONTENT_EXPORT extern const char kChromeUINetworkErrorsListingURL[];
CONTENT_EXPORT extern const char kChromeUINetworkErrorURL[]; CONTENT_EXPORT extern const char kChromeUINetworkErrorURL[];
CONTENT_EXPORT extern const char kChromeUIPpapiFlashCrashURL[]; CONTENT_EXPORT extern const char kChromeUIPpapiFlashCrashURL[];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment