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

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: alexmos comments addressed 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 759 matching lines...) Expand 10 before | Expand all | Expand 10 after
770 void WebFrameWidgetImpl::SetRemoteViewportIntersection( 770 void WebFrameWidgetImpl::SetRemoteViewportIntersection(
771 const WebRect& viewport_intersection) { 771 const WebRect& viewport_intersection) {
772 // Remote viewports are only applicable to local frames with remote ancestors. 772 // Remote viewports are only applicable to local frames with remote ancestors.
773 DCHECK(local_root_->Parent() && local_root_->Parent()->IsWebRemoteFrame() && 773 DCHECK(local_root_->Parent() && local_root_->Parent()->IsWebRemoteFrame() &&
774 local_root_->GetFrame()); 774 local_root_->GetFrame());
775 775
776 local_root_->GetFrame()->SetViewportIntersectionFromParent( 776 local_root_->GetFrame()->SetViewportIntersectionFromParent(
777 viewport_intersection); 777 viewport_intersection);
778 } 778 }
779 779
780 void WebFrameWidgetImpl::SetIsInert(bool inert) {
781 DCHECK(local_root_->Parent());
782 DCHECK(local_root_->Parent()->IsWebRemoteFrame());
783 local_root_->GetFrame()->SetIsInert(inert);
784 }
785
780 void WebFrameWidgetImpl::HandleMouseLeave(LocalFrame& main_frame, 786 void WebFrameWidgetImpl::HandleMouseLeave(LocalFrame& main_frame,
781 const WebMouseEvent& event) { 787 const WebMouseEvent& event) {
782 // FIXME: WebWidget doesn't have the method below. 788 // FIXME: WebWidget doesn't have the method below.
783 // m_client->setMouseOverURL(WebURL()); 789 // m_client->setMouseOverURL(WebURL());
784 PageWidgetEventHandler::HandleMouseLeave(main_frame, event); 790 PageWidgetEventHandler::HandleMouseLeave(main_frame, event);
785 } 791 }
786 792
787 void WebFrameWidgetImpl::HandleMouseDown(LocalFrame& main_frame, 793 void WebFrameWidgetImpl::HandleMouseDown(LocalFrame& main_frame,
788 const WebMouseEvent& event) { 794 const WebMouseEvent& event) {
789 WebViewBase* view_impl = View(); 795 WebViewBase* view_impl = View();
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
1200 : nullptr; 1206 : nullptr;
1201 } 1207 }
1202 1208
1203 LocalFrame* WebFrameWidgetImpl::FocusedLocalFrameAvailableForIme() const { 1209 LocalFrame* WebFrameWidgetImpl::FocusedLocalFrameAvailableForIme() const {
1204 if (!ime_accept_events_) 1210 if (!ime_accept_events_)
1205 return nullptr; 1211 return nullptr;
1206 return FocusedLocalFrameInWidget(); 1212 return FocusedLocalFrameInWidget();
1207 } 1213 }
1208 1214
1209 } // namespace blink 1215 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698