mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-01-31 19:45:27 +01:00
2f1e782f62
Frame identifiers have changed from int64_t to string type. This is due to https://crbug.com/1502660 which removes access to frame routing IDs in the renderer process. New cross-process frame identifiers are 160-bit values (32-bit child process ID + 128-bit local frame token) and most easily represented as strings. All other frame-related expectations and behaviors remain the same.
45 lines
1.7 KiB
Diff
45 lines
1.7 KiB
Diff
diff --git third_party/blink/public/platform/platform.h third_party/blink/public/platform/platform.h
|
|
index 52829e870d30a..bf87e1750cd3f 100644
|
|
--- third_party/blink/public/platform/platform.h
|
|
+++ third_party/blink/public/platform/platform.h
|
|
@@ -781,6 +781,11 @@ class BLINK_PLATFORM_EXPORT Platform {
|
|
}
|
|
#endif
|
|
|
|
+ // DevTools ------------------------------------------------------------
|
|
+
|
|
+ virtual void DevToolsAgentAttached() {}
|
|
+ virtual void DevToolsAgentDetached() {}
|
|
+
|
|
private:
|
|
static void InitializeMainThreadCommon(
|
|
Platform* platform,
|
|
diff --git third_party/blink/renderer/core/inspector/devtools_session.cc third_party/blink/renderer/core/inspector/devtools_session.cc
|
|
index ae0907dfd95ec..63620f0aadc14 100644
|
|
--- third_party/blink/renderer/core/inspector/devtools_session.cc
|
|
+++ third_party/blink/renderer/core/inspector/devtools_session.cc
|
|
@@ -10,6 +10,7 @@
|
|
|
|
#include "base/task/sequenced_task_runner.h"
|
|
#include "base/task/single_thread_task_runner.h"
|
|
+#include "third_party/blink/public/platform/platform.h"
|
|
#include "third_party/blink/renderer/bindings/core/v8/script_controller.h"
|
|
#include "third_party/blink/renderer/core/frame/local_frame.h"
|
|
#include "third_party/blink/renderer/core/inspector/devtools_agent.h"
|
|
@@ -168,6 +169,7 @@ DevToolsSession::DevToolsSession(
|
|
for (wtf_size_t i = 0; i < agents_.size(); i++)
|
|
agents_[i]->Restore();
|
|
}
|
|
+ Platform::Current()->DevToolsAgentAttached();
|
|
}
|
|
|
|
DevToolsSession::~DevToolsSession() {
|
|
@@ -213,6 +215,7 @@ void DevToolsSession::Detach() {
|
|
agents_.clear();
|
|
v8_session_.reset();
|
|
agent_->client_->DebuggerTaskFinished();
|
|
+ Platform::Current()->DevToolsAgentDetached();
|
|
}
|
|
|
|
void DevToolsSession::DetachFromV8() {
|