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

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: Set Frame's inert bit on style calculation Created 3 years, 6 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 754 matching lines...) Expand 10 before | Expand all | Expand 10 after
765 const WebRect& viewport_intersection) { 765 const WebRect& viewport_intersection) {
766 // Remote viewports are only applicable to local frames with remote ancestors. 766 // Remote viewports are only applicable to local frames with remote ancestors.
767 DCHECK(local_root_->Parent() && local_root_->Parent()->IsWebRemoteFrame()); 767 DCHECK(local_root_->Parent() && local_root_->Parent()->IsWebRemoteFrame());
768 768
769 if (local_root_->GetFrameView()) { 769 if (local_root_->GetFrameView()) {
770 local_root_->GetFrameView()->SetViewportIntersectionFromParent( 770 local_root_->GetFrameView()->SetViewportIntersectionFromParent(
771 viewport_intersection); 771 viewport_intersection);
772 } 772 }
773 } 773 }
774 774
775 void WebFrameWidgetImpl::SetIsInert(bool inert) {
776 DCHECK(local_root_->Parent() && local_root_->Parent()->IsWebRemoteFrame());
tkent 2017/06/08 23:53:49 nit: Split the DCHECK into two so that we can know
kenrb 2017/06/09 19:26:30 Done.
777 local_root_->GetFrame()->SetIsInert(inert);
778 }
779
775 void WebFrameWidgetImpl::HandleMouseLeave(LocalFrame& main_frame, 780 void WebFrameWidgetImpl::HandleMouseLeave(LocalFrame& main_frame,
776 const WebMouseEvent& event) { 781 const WebMouseEvent& event) {
777 // FIXME: WebWidget doesn't have the method below. 782 // FIXME: WebWidget doesn't have the method below.
778 // m_client->setMouseOverURL(WebURL()); 783 // m_client->setMouseOverURL(WebURL());
779 PageWidgetEventHandler::HandleMouseLeave(main_frame, event); 784 PageWidgetEventHandler::HandleMouseLeave(main_frame, event);
780 } 785 }
781 786
782 void WebFrameWidgetImpl::HandleMouseDown(LocalFrame& main_frame, 787 void WebFrameWidgetImpl::HandleMouseDown(LocalFrame& main_frame,
783 const WebMouseEvent& event) { 788 const WebMouseEvent& event) {
784 WebViewBase* view_impl = View(); 789 WebViewBase* view_impl = View();
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
1195 : nullptr; 1200 : nullptr;
1196 } 1201 }
1197 1202
1198 LocalFrame* WebFrameWidgetImpl::FocusedLocalFrameAvailableForIme() const { 1203 LocalFrame* WebFrameWidgetImpl::FocusedLocalFrameAvailableForIme() const {
1199 if (!ime_accept_events_) 1204 if (!ime_accept_events_)
1200 return nullptr; 1205 return nullptr;
1201 return FocusedLocalFrameInWidget(); 1206 return FocusedLocalFrameInWidget();
1202 } 1207 }
1203 1208
1204 } // namespace blink 1209 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698