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

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: nit addressed Created 3 years, 5 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 765 matching lines...) Expand 10 before | Expand all | Expand 10 after
776 void WebFrameWidgetImpl::SetRemoteViewportIntersection( 776 void WebFrameWidgetImpl::SetRemoteViewportIntersection(
777 const WebRect& viewport_intersection) { 777 const WebRect& viewport_intersection) {
778 // Remote viewports are only applicable to local frames with remote ancestors. 778 // Remote viewports are only applicable to local frames with remote ancestors.
779 DCHECK(local_root_->Parent() && local_root_->Parent()->IsWebRemoteFrame() && 779 DCHECK(local_root_->Parent() && local_root_->Parent()->IsWebRemoteFrame() &&
780 local_root_->GetFrame()); 780 local_root_->GetFrame());
781 781
782 local_root_->GetFrame()->SetViewportIntersectionFromParent( 782 local_root_->GetFrame()->SetViewportIntersectionFromParent(
783 viewport_intersection); 783 viewport_intersection);
784 } 784 }
785 785
786 void WebFrameWidgetImpl::SetIsInert(bool inert) {
787 DCHECK(local_root_->Parent());
788 DCHECK(local_root_->Parent()->IsWebRemoteFrame());
789 local_root_->GetFrame()->SetIsInert(inert);
790 }
791
786 void WebFrameWidgetImpl::HandleMouseLeave(LocalFrame& main_frame, 792 void WebFrameWidgetImpl::HandleMouseLeave(LocalFrame& main_frame,
787 const WebMouseEvent& event) { 793 const WebMouseEvent& event) {
788 // FIXME: WebWidget doesn't have the method below. 794 // FIXME: WebWidget doesn't have the method below.
789 // m_client->setMouseOverURL(WebURL()); 795 // m_client->setMouseOverURL(WebURL());
790 PageWidgetEventHandler::HandleMouseLeave(main_frame, event); 796 PageWidgetEventHandler::HandleMouseLeave(main_frame, event);
791 } 797 }
792 798
793 void WebFrameWidgetImpl::HandleMouseDown(LocalFrame& main_frame, 799 void WebFrameWidgetImpl::HandleMouseDown(LocalFrame& main_frame,
794 const WebMouseEvent& event) { 800 const WebMouseEvent& event) {
795 WebViewBase* view_impl = View(); 801 WebViewBase* view_impl = View();
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
1206 : nullptr; 1212 : nullptr;
1207 } 1213 }
1208 1214
1209 LocalFrame* WebFrameWidgetImpl::FocusedLocalFrameAvailableForIme() const { 1215 LocalFrame* WebFrameWidgetImpl::FocusedLocalFrameAvailableForIme() const {
1210 if (!ime_accept_events_) 1216 if (!ime_accept_events_)
1211 return nullptr; 1217 return nullptr;
1212 return FocusedLocalFrameInWidget(); 1218 return FocusedLocalFrameInWidget();
1213 } 1219 }
1214 1220
1215 } // namespace blink 1221 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebFrameWidgetImpl.h ('k') | third_party/WebKit/public/web/WebFrameWidget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698