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

Side by Side Diff: third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp

Issue 2883033003: Propagate inert state to OOPIFs when a modal dialog is active (Closed)
Patch Set: Rebase only 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) 2014 Google Inc. All rights reserved. 2 * Copyright (C) 2014 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 756 matching lines...) Expand 10 before | Expand all | Expand 10 after
767 const WebRect& viewport_intersection) { 767 const WebRect& viewport_intersection) {
768 // Remote viewports are only applicable to local frames with remote ancestors. 768 // Remote viewports are only applicable to local frames with remote ancestors.
769 DCHECK(local_root_->Parent() && local_root_->Parent()->IsWebRemoteFrame()); 769 DCHECK(local_root_->Parent() && local_root_->Parent()->IsWebRemoteFrame());
770 770
771 if (local_root_->GetFrameView()) { 771 if (local_root_->GetFrameView()) {
772 local_root_->GetFrameView()->SetViewportIntersectionFromParent( 772 local_root_->GetFrameView()->SetViewportIntersectionFromParent(
773 viewport_intersection); 773 viewport_intersection);
774 } 774 }
775 } 775 }
776 776
777 void WebFrameWidgetImpl::SetIsInert(bool inert) {
778 DCHECK(local_root_->Parent() && local_root_->Parent()->IsWebRemoteFrame());
779 local_root_->GetFrame()->SetIsInert(inert);
780 }
781
777 void WebFrameWidgetImpl::HandleMouseLeave(LocalFrame& main_frame, 782 void WebFrameWidgetImpl::HandleMouseLeave(LocalFrame& main_frame,
778 const WebMouseEvent& event) { 783 const WebMouseEvent& event) {
779 // FIXME: WebWidget doesn't have the method below. 784 // FIXME: WebWidget doesn't have the method below.
780 // m_client->setMouseOverURL(WebURL()); 785 // m_client->setMouseOverURL(WebURL());
781 PageWidgetEventHandler::HandleMouseLeave(main_frame, event); 786 PageWidgetEventHandler::HandleMouseLeave(main_frame, event);
782 } 787 }
783 788
784 void WebFrameWidgetImpl::HandleMouseDown(LocalFrame& main_frame, 789 void WebFrameWidgetImpl::HandleMouseDown(LocalFrame& main_frame,
785 const WebMouseEvent& event) { 790 const WebMouseEvent& event) {
786 WebViewBase* view_impl = View(); 791 WebViewBase* view_impl = View();
(...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after
1206 return nullptr; 1211 return nullptr;
1207 } 1212 }
1208 1213
1209 LocalFrame* WebFrameWidgetImpl::FocusedLocalFrameAvailableForIme() const { 1214 LocalFrame* WebFrameWidgetImpl::FocusedLocalFrameAvailableForIme() const {
1210 if (!ime_accept_events_) 1215 if (!ime_accept_events_)
1211 return nullptr; 1216 return nullptr;
1212 return FocusedLocalFrameInWidget(); 1217 return FocusedLocalFrameInWidget();
1213 } 1218 }
1214 1219
1215 } // namespace blink 1220 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698