github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-09 15:38:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove revert_remove_contentrendererclient_shouldfork.patch (#29842)

Browse Source
This commit is contained in:
Robo
2021-06-23 06:50:57 +09:00
committed by GitHub
parent b8261f1591
commit 6e310b7424
8 changed files with 3 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
shell/renderer/electron_renderer_client.cc
View File

@@ -165,17 +165,6 @@ void ElectronRendererClient::WillReleaseScriptContext(
electron_bindings_->EnvironmentDestroyed(env);
}
bool ElectronRendererClient::ShouldFork(blink::WebLocalFrame* frame,
const GURL& url,
const std::string& http_method,
bool is_server_redirect) {
// Handle all the navigations and reloads in browser.
// FIXME We only support GET here because http method will be ignored when
// the OpenURLFromTab is triggered, which means form posting would not work,
// we should solve this by patching Chromium in future.
return http_method == net::HttpRequestHeaders::kGetMethod;
}
void ElectronRendererClient::WorkerScriptReadyForEvaluationOnWorkerThread(
v8::Local<v8::Context> context) {
// TODO(loc): Note that this will not be correct for in-process child windows

4
shell/renderer/electron_renderer_client.h
View File

@@ -36,10 +36,6 @@ class ElectronRendererClient : public RendererClientBase {
void RenderFrameCreated(content::RenderFrame*) override;
void RunScriptsAtDocumentStart(content::RenderFrame* render_frame) override;
void RunScriptsAtDocumentEnd(content::RenderFrame* render_frame) override;
bool ShouldFork(blink::WebLocalFrame* frame,
const GURL& url,
const std::string& http_method,
bool is_server_redirect) override;
void WorkerScriptReadyForEvaluationOnWorkerThread(
v8::Local<v8::Context> context) override;
void WillDestroyWorkerContextOnWorkerThread(

7
shell/renderer/electron_sandboxed_renderer_client.cc
View File

@@ -254,11 +254,4 @@ void ElectronSandboxedRendererClient::WillReleaseScriptContext(
InvokeHiddenCallback(context, kLifecycleKey, "onExit");
}
bool ElectronSandboxedRendererClient::ShouldFork(blink::WebLocalFrame* frame,
const GURL& url,
const std::string& http_method,
bool is_server_redirect) {
return true;
}
} // namespace electron

4
shell/renderer/electron_sandboxed_renderer_client.h
View File

@@ -30,10 +30,6 @@ class ElectronSandboxedRendererClient : public RendererClientBase {
void RenderFrameCreated(content::RenderFrame*) override;
void RunScriptsAtDocumentStart(content::RenderFrame* render_frame) override;
void RunScriptsAtDocumentEnd(content::RenderFrame* render_frame) override;
bool ShouldFork(blink::WebLocalFrame* frame,
const GURL& url,
const std::string& http_method,
bool is_server_redirect) override;
private:
std::unique_ptr<base::ProcessMetrics> metrics_;