refactor: inline and rename findInPage request id (electron#26524)

nornagon · web-flow · commit 29211a51df57 · 2020-11-17T14:15:07.000-08:00
diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
@@ -2627,7 +2627,7 @@ uint32_t WebContents::FindInPage(gin::Arguments* args) {
     return 0;
   }
 
-  uint32_t request_id = GetNextRequestId();
+  uint32_t request_id = ++find_in_page_request_id_;
   gin_helper::Dictionary dict;
   auto options = blink::mojom::FindOptions::New();
   if (args->GetNext(&dict)) {
diff --git a/shell/browser/api/electron_api_web_contents.h b/shell/browser/api/electron_api_web_contents.h
@@ -598,8 +598,6 @@ class WebContents : public gin::Wrappable<WebContents>,
       content::RenderFrameHost* render_frame_host);
   void OnElectronBrowserConnectionError();
 
-  uint32_t GetNextRequestId() { return ++request_id_; }
-
 #if BUILDFLAG(ENABLE_OSR)
   OffScreenWebContentsView* GetOffScreenWebContentsView() const;
   OffScreenRenderWidgetHostView* GetOffScreenRenderWidgetHostView() const;
@@ -735,7 +733,7 @@ class WebContents : public gin::Wrappable<WebContents>,
   int32_t id_;
 
   // Request id used for findInPage request.
-  uint32_t request_id_ = 0;
+  uint32_t find_in_page_request_id_ = 0;
 
   // Whether background throttling is disabled.
   bool background_throttling_ = true;

Original file line number	Diff line number	Diff line change
`@@ -2627,7 +2627,7 @@ uint32_t WebContents::FindInPage(gin::Arguments* args) {`
`2627`	`2627`	`return 0;`
`2628`	`2628`	`}`
`2629`	`2629`
`2630`		`- uint32_t request_id = GetNextRequestId();`
	`2630`	`+ uint32_t request_id = ++find_in_page_request_id_;`
`2631`	`2631`	`gin_helper::Dictionary dict;`
`2632`	`2632`	`auto options = blink::mojom::FindOptions::New();`
`2633`	`2633`	`if (args->GetNext(&dict)) {`