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

Side by Side Diff: third_party/WebKit/Source/core/frame/LocalFrame.h

Issue 2883033003: Propagate inert state to OOPIFs when a modal dialog is active (Closed)
Patch Set: Trying to fix patch application problem Created 3 years, 7 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999-2001 Lars Knoll <knoll@kde.org> 3 * 1999-2001 Lars Knoll <knoll@kde.org>
4 * 1999-2001 Antti Koivisto <koivisto@kde.org> 4 * 1999-2001 Antti Koivisto <koivisto@kde.org>
5 * 2000-2001 Simon Hausmann <hausmann@kde.org> 5 * 2000-2001 Simon Hausmann <hausmann@kde.org>
6 * 2000-2001 Dirk Mueller <mueller@kde.org> 6 * 2000-2001 Dirk Mueller <mueller@kde.org>
7 * 2000 Stefan Schimanski <1Stein@gmx.de> 7 * 2000 Stefan Schimanski <1Stein@gmx.de>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
9 * reserved. 9 * reserved.
10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 227
228 PluginData* GetPluginData() const; 228 PluginData* GetPluginData() const;
229 229
230 PerformanceMonitor* GetPerformanceMonitor() { return performance_monitor_; } 230 PerformanceMonitor* GetPerformanceMonitor() { return performance_monitor_; }
231 231
232 // Convenience function to allow loading image placeholders for the request if 232 // Convenience function to allow loading image placeholders for the request if
233 // either the flag in Settings() for using image placeholders is set, or if 233 // either the flag in Settings() for using image placeholders is set, or if
234 // the embedder decides that Client Lo-Fi should be used for this request. 234 // the embedder decides that Client Lo-Fi should be used for this request.
235 void MaybeAllowImagePlaceholder(FetchParameters&) const; 235 void MaybeAllowImagePlaceholder(FetchParameters&) const;
236 236
237 bool IsInert() const { return is_inert_; }
238 void SetIsInert(bool inert);
239
237 using FrameInitCallback = void (*)(LocalFrame*); 240 using FrameInitCallback = void (*)(LocalFrame*);
238 // Allows for the registration of a callback that is invoked whenever a new 241 // Allows for the registration of a callback that is invoked whenever a new
239 // LocalFrame is initialized. Callbacks are executed in the order that they 242 // LocalFrame is initialized. Callbacks are executed in the order that they
240 // were added using registerInitializationCallback, and there are no checks 243 // were added using registerInitializationCallback, and there are no checks
241 // for adding a callback multiple times. 244 // for adding a callback multiple times.
242 static void RegisterInitializationCallback(FrameInitCallback); 245 static void RegisterInitializationCallback(FrameInitCallback);
243 246
244 private: 247 private:
245 friend class FrameNavigationDisabler; 248 friend class FrameNavigationDisabler;
246 249
(...skipping 30 matching lines...) Expand all
277 const Member<FrameConsole> console_; 280 const Member<FrameConsole> console_;
278 const Member<InputMethodController> input_method_controller_; 281 const Member<InputMethodController> input_method_controller_;
279 282
280 int navigation_disable_count_; 283 int navigation_disable_count_;
281 284
282 float page_zoom_factor_; 285 float page_zoom_factor_;
283 float text_zoom_factor_; 286 float text_zoom_factor_;
284 287
285 bool in_view_source_mode_; 288 bool in_view_source_mode_;
286 289
290 bool is_inert_;
291
287 Member<CoreProbeSink> probe_sink_; 292 Member<CoreProbeSink> probe_sink_;
288 Member<PerformanceMonitor> performance_monitor_; 293 Member<PerformanceMonitor> performance_monitor_;
289 294
290 InterfaceProvider* const interface_provider_; 295 InterfaceProvider* const interface_provider_;
291 InterfaceRegistry* const interface_registry_; 296 InterfaceRegistry* const interface_registry_;
292 }; 297 };
293 298
294 inline FrameLoader& LocalFrame::Loader() const { 299 inline FrameLoader& LocalFrame::Loader() const {
295 return loader_; 300 return loader_;
296 } 301 }
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 explicit ScopedFrameBlamer(LocalFrame*); 388 explicit ScopedFrameBlamer(LocalFrame*);
384 ~ScopedFrameBlamer(); 389 ~ScopedFrameBlamer();
385 390
386 private: 391 private:
387 Member<LocalFrame> frame_; 392 Member<LocalFrame> frame_;
388 }; 393 };
389 394
390 } // namespace blink 395 } // namespace blink
391 396
392 #endif // LocalFrame_h 397 #endif // LocalFrame_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698