Commit 1c6fb8ca authored by Scott Violet's avatar Scott Violet Committed by Commit Bot

webview: adds weblayer-web-view-compat-mode to whitelist of crash keys

Without this, the value isn't reported.

BUG=none
TEST=none

Change-Id: I4e02d0cfc5aa0a9156a44884e6ea37682aee9cce
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2161583
Commit-Queue: Scott Violet <sky@chromium.org>
Reviewed-by: default avatarBo <boliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#761904}
parent f8f1f3d5
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include "android_webview/browser/safe_browsing/aw_safe_browsing_whitelist_manager.h" #include "android_webview/browser/safe_browsing/aw_safe_browsing_whitelist_manager.h"
#include "android_webview/browser_jni_headers/AwBrowserContext_jni.h" #include "android_webview/browser_jni_headers/AwBrowserContext_jni.h"
#include "android_webview/common/aw_features.h" #include "android_webview/common/aw_features.h"
#include "android_webview/common/crash_reporter/crash_keys.h"
#include "base/base_paths_posix.h" #include "base/base_paths_posix.h"
#include "base/bind.h" #include "base/bind.h"
#include "base/feature_list.h" #include "base/feature_list.h"
...@@ -73,7 +74,7 @@ const void* const kDownloadManagerDelegateKey = &kDownloadManagerDelegateKey; ...@@ -73,7 +74,7 @@ const void* const kDownloadManagerDelegateKey = &kDownloadManagerDelegateKey;
AwBrowserContext* g_browser_context = NULL; AwBrowserContext* g_browser_context = NULL;
crash_reporter::CrashKeyString<1> g_web_view_compat_crash_key( crash_reporter::CrashKeyString<1> g_web_view_compat_crash_key(
"WEBLAYER_WEB_VIEW_COMPAT_MODE"); crash_keys::kWeblayerWebViewCompatMode);
// Empty method to skip origin security check as DownloadManager will set its // Empty method to skip origin security check as DownloadManager will set its
// own method. // own method.
......
...@@ -17,6 +17,9 @@ const char kAndroidSdkInt[] = "android-sdk-int"; ...@@ -17,6 +17,9 @@ const char kAndroidSdkInt[] = "android-sdk-int";
const char kSupportLibraryWebkitVersion[] = "androidx-webkit-version"; const char kSupportLibraryWebkitVersion[] = "androidx-webkit-version";
extern const char kWeblayerWebViewCompatMode[] =
"WEBLAYER_WEB_VIEW_COMPAT_MODE";
// clang-format off // clang-format off
const char* const kWebViewCrashKeyWhiteList[] = { const char* const kWebViewCrashKeyWhiteList[] = {
"AW_WHITELISTED_DEBUG_KEY", "AW_WHITELISTED_DEBUG_KEY",
...@@ -69,6 +72,9 @@ const char* const kWebViewCrashKeyWhiteList[] = { ...@@ -69,6 +72,9 @@ const char* const kWebViewCrashKeyWhiteList[] = {
"variations__7", "variations__7",
"variations__8", "variations__8",
"num-experiments", "num-experiments",
kWeblayerWebViewCompatMode,
nullptr}; nullptr};
// clang-format on // clang-format on
......
...@@ -24,6 +24,11 @@ extern const char kAndroidSdkInt[]; ...@@ -24,6 +24,11 @@ extern const char kAndroidSdkInt[];
extern const char kSupportLibraryWebkitVersion[]; extern const char kSupportLibraryWebkitVersion[];
// Indicates whether weblayer and webview are running in the same process.
// When this is true, crashes may be reported to both WebLayer and WebView,
// regardless of whetere the crash happened.
extern const char kWeblayerWebViewCompatMode[];
} // namespace crash_keys } // namespace crash_keys
} // namespace android_webview } // namespace android_webview
......
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