OLD | NEW |
---|---|
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 748 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
759 | 759 |
760 bounds.Swap(result); | 760 bounds.Swap(result); |
761 return true; | 761 return true; |
762 } | 762 } |
763 | 763 |
764 void WebFrameWidgetImpl::SetRemoteViewportIntersection( | 764 void WebFrameWidgetImpl::SetRemoteViewportIntersection( |
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_->GetFrame()) { |
dcheng
2017/05/30 22:14:26
Hmm... I wonder if we can get this when there's no
kenrb
2017/05/31 01:37:29
I'll take a look.
| |
770 local_root_->GetFrameView()->SetViewportIntersectionFromParent( | 770 local_root_->GetFrame()->SetViewportIntersectionFromParent( |
771 viewport_intersection); | 771 viewport_intersection); |
772 } | 772 } |
773 } | 773 } |
774 | 774 |
775 void WebFrameWidgetImpl::HandleMouseLeave(LocalFrame& main_frame, | 775 void WebFrameWidgetImpl::HandleMouseLeave(LocalFrame& main_frame, |
776 const WebMouseEvent& event) { | 776 const WebMouseEvent& event) { |
777 // FIXME: WebWidget doesn't have the method below. | 777 // FIXME: WebWidget doesn't have the method below. |
778 // m_client->setMouseOverURL(WebURL()); | 778 // m_client->setMouseOverURL(WebURL()); |
779 PageWidgetEventHandler::HandleMouseLeave(main_frame, event); | 779 PageWidgetEventHandler::HandleMouseLeave(main_frame, event); |
780 } | 780 } |
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1195 : nullptr; | 1195 : nullptr; |
1196 } | 1196 } |
1197 | 1197 |
1198 LocalFrame* WebFrameWidgetImpl::FocusedLocalFrameAvailableForIme() const { | 1198 LocalFrame* WebFrameWidgetImpl::FocusedLocalFrameAvailableForIme() const { |
1199 if (!ime_accept_events_) | 1199 if (!ime_accept_events_) |
1200 return nullptr; | 1200 return nullptr; |
1201 return FocusedLocalFrameInWidget(); | 1201 return FocusedLocalFrameInWidget(); |
1202 } | 1202 } |
1203 | 1203 |
1204 } // namespace blink | 1204 } // namespace blink |
OLD | NEW |