Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: bf6e4b1247
Branches Tags
electron
/
patches
/
chromium
/
revert_remove_contentrendererclient_shouldfork.patch

revert_remove_contentrendererclient_shouldfork.patch 4.5 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107 
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    2. 

  2. From: deepak1556 <[email protected]>
    3. 

  3. Date: Wed, 23 Oct 2019 15:30:18 -0700
    4. 

  4. Subject: Revert "Remove ContentRendererClient::ShouldFork."
    5. 

  5. 

  6. This reverts commit 6b068eb8ca4a3c7350bdafa22fc0cf0636ef8b74.
    7. 

  7. 

  8. diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
    9. 

  9. index d37bd7451b4a73fc7b00e5cc1dfcb823c7a142fb..0e2800f3e5b0ee1b8e88921cbf3f18258ca51e7b 100644
    10. 

  10. --- a/chrome/renderer/chrome_content_renderer_client.cc
    11. 

  11. +++ b/chrome/renderer/chrome_content_renderer_client.cc
    12. 

  12. @@ -1302,6 +1302,17 @@ bool ChromeContentRendererClient::ShouldFork(WebLocalFrame* frame,
    13. 

  13.      return true;
    14. 

  14.  #endif  // BUILDFLAG(ENABLE_EXTENSIONS)
    15. 

  15.  
    16. 

  16. +  DCHECK(!frame->Parent());
    17. 

  17. +
    18. 

  18. +  // If |url| matches one of the prerendered URLs, stop this navigation and try
    19. 

  19. +  // to swap in the prerendered page on the browser process. If the prerendered
    20. 

  20. +  // page no longer exists by the time the OpenURL IPC is handled, a normal
    21. 

  21. +  // navigation is attempted.
    22. 

  22. +  if (prerender_dispatcher_.get() &&
    23. 

  23. +      prerender_dispatcher_->IsPrerenderURL(url)) {
    24. 

  24. +    return true;
    25. 

  25. +  }
    26. 

  26. +
    27. 

  27.    return false;
    28. 

  28.  }
    29. 

  29.  
    30. 

  30. diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
    31. 

  31. index 1659f93d83357337cb6e2cab668811cba3f14508..ef2aafde43347a6af188cada40c106dba8a19d31 100644
    32. 

  32. --- a/content/renderer/render_view_browsertest.cc
    33. 

  33. +++ b/content/renderer/render_view_browsertest.cc
    34. 

  34. @@ -990,6 +990,73 @@ TEST_F(RenderViewImplTest, BeginNavigationForWebUI) {
    35. 

  35.        FrameHostMsg_OpenURL::ID));
    36. 

  36.  }
    37. 

  37.  
    38. 

  38. +class AlwaysForkingRenderViewTest : public RenderViewImplTest {
    39. 

  39. + public:
    40. 

  40. +  ContentRendererClient* CreateContentRendererClient() override {
    41. 

  41. +    return new TestContentRendererClient;
    42. 

  42. +  }
    43. 

  43. +
    44. 

  44. + private:
    45. 

  45. +  class TestContentRendererClient : public ContentRendererClient {
    46. 

  46. +   public:
    47. 

  47. +    bool ShouldFork(blink::WebLocalFrame* frame,
    48. 

  48. +                    const GURL& url,
    49. 

  49. +                    const std::string& http_method,
    50. 

  50. +                    bool is_initial_navigation,
    51. 

  51. +                    bool is_server_redirect) override {
    52. 

  52. +      return true;
    53. 

  53. +    }
    54. 

  54. +  };
    55. 

  55. +};
    56. 

  56. +
    57. 

  57. +TEST_F(AlwaysForkingRenderViewTest, BeginNavigationDoesNotForkEmptyUrl) {
    58. 

  58. +  GURL example_url("http://example.com");
    59. 

  59. +  GURL empty_url("");
    60. 

  60. +
    61. 

  61. +  LoadHTMLWithUrlOverride("<body></body", example_url.spec().c_str());
    62. 

  62. +  EXPECT_EQ(example_url,
    63. 

  63. +            GURL(frame()->GetWebFrame()->GetDocumentLoader()->GetUrl()));
    64. 

  64. +
    65. 

  65. +  // Empty url should never fork.
    66. 

  66. +  blink::WebURLRequest request(empty_url);
    67. 

  67. +  request.SetMode(network::mojom::RequestMode::kNavigate);
    68. 

  68. +  request.SetRedirectMode(network::mojom::RedirectMode::kManual);
    69. 

  69. +  request.SetRequestContext(blink::mojom::RequestContextType::INTERNAL);
    70. 

  70. +  request.SetRequestorOrigin(blink::WebSecurityOrigin::Create(example_url));
    71. 

  71. +  auto navigation_info = std::make_unique<blink::WebNavigationInfo>();
    72. 

  72. +  navigation_info->url_request = request;
    73. 

  73. +  navigation_info->frame_type =
    74. 

  74. +      network::mojom::RequestContextFrameType::kTopLevel;
    75. 

  75. +  navigation_info->navigation_policy = blink::kWebNavigationPolicyCurrentTab;
    76. 

  76. +  frame()->BeginNavigation(std::move(navigation_info));
    77. 

  77. +  EXPECT_FALSE(render_thread_->sink().GetUniqueMessageMatching(
    78. 

  78. +      FrameHostMsg_OpenURL::ID));
    79. 

  79. +}
    80. 

  80. +
    81. 

  81. +TEST_F(AlwaysForkingRenderViewTest, BeginNavigationDoesNotForkAboutBlank) {
    82. 

  82. +  GURL example_url("http://example.com");
    83. 

  83. +  GURL blank_url(url::kAboutBlankURL);
    84. 

  84. +
    85. 

  85. +  LoadHTMLWithUrlOverride("<body></body", example_url.spec().c_str());
    86. 

  86. +  EXPECT_EQ(example_url,
    87. 

  87. +            GURL(frame()->GetWebFrame()->GetDocumentLoader()->GetUrl()));
    88. 

  88. +
    89. 

  89. +  // about:blank should never fork.
    90. 

  90. +  blink::WebURLRequest request(blank_url);
    91. 

  91. +  request.SetMode(network::mojom::RequestMode::kNavigate);
    92. 

  92. +  request.SetRedirectMode(network::mojom::RedirectMode::kManual);
    93. 

  93. +  request.SetRequestContext(blink::mojom::RequestContextType::INTERNAL);
    94. 

  94. +  request.SetRequestorOrigin(blink::WebSecurityOrigin::Create(example_url));
    95. 

  95. +  auto navigation_info = std::make_unique<blink::WebNavigationInfo>();
    96. 

  96. +  navigation_info->url_request = request;
    97. 

  97. +  navigation_info->frame_type =
    98. 

  98. +      network::mojom::RequestContextFrameType::kTopLevel;
    99. 

  99. +  navigation_info->navigation_policy = blink::kWebNavigationPolicyCurrentTab;
    100. 

  100. +  frame()->BeginNavigation(std::move(navigation_info));
    101. 

  101. +  EXPECT_FALSE(render_thread_->sink().GetUniqueMessageMatching(
    102. 

  102. +      FrameHostMsg_OpenURL::ID));
    103. 

  103. +}
    104. 

  104. +
    105. 

  105.  // This test verifies that when device emulation is enabled, RenderFrameProxy
    106. 

  106.  // continues to receive the original ScreenInfo and not the emualted
    107. 

  107.  // ScreenInfo.
    108.