Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Unified Diff: content/renderer/render_frame_impl.h

Issue 1849013004: Fix JavaScript alerts from frames with oopif on, after a cross-process click. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@alertfix
Patch Set: ordering Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/render_frame_impl.h
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index 181aae71d2c91cdfd9a41b0f875f5ef1d35398ee..5a19754c5de335d397e4f46cdd906d0b956dbdee 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -799,6 +799,7 @@ class CONTENT_EXPORT RenderFrameImpl
const blink::WebFindOptions& options);
void OnStopFinding(StopFindAction action);
void OnEnableViewSourceMode();
+ void OnSuppressDialogsUntilSwapOut();
#if defined(OS_ANDROID)
void OnActivateNearestFindResult(int request_id, float x, float y);
void OnFindMatchRects(int current_version);
@@ -1204,6 +1205,11 @@ class CONTENT_EXPORT RenderFrameImpl
// Whether or not this RenderFrame is currently pasting.
bool is_pasting_;
+ // Whether we must stop creating nested message loops for modal dialogs until
+ // OnSwapOut is called. This is necessary because modal dialogs have a
+ // PageGroupLoadDeferrer on the stack that interferes with swapping out.
+ bool suppress_dialogs_until_swap_out_;
+
#if defined(ENABLE_WEBVR)
// The VR dispatcher attached to the frame, lazily initialized.
scoped_ptr<VRDispatcher> vr_dispatcher_;

Powered by Google App Engine
This is Rietveld 408576698