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

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

Issue 1433103002: Use FocusParams in FocusController::setFocusedElement and Document::setFocusedElement arguments. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * Copyright (C) 2014 Opera Software ASA. All rights reserved. 3 * Copyright (C) 2014 Opera Software ASA. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 910 matching lines...) Expand 10 before | Expand all | Expand 10 after
921 if (m_webPlugin->handleInputEvent(webEvent, cursorInfo)) 921 if (m_webPlugin->handleInputEvent(webEvent, cursorInfo))
922 event->setDefaultHandled(); 922 event->setDefaultHandled();
923 } 923 }
924 924
925 void WebPluginContainerImpl::focusPlugin() 925 void WebPluginContainerImpl::focusPlugin()
926 { 926 {
927 LocalFrame& containingFrame = toFrameView(parent())->frame(); 927 LocalFrame& containingFrame = toFrameView(parent())->frame();
928 if (Page* currentPage = containingFrame.page()) 928 if (Page* currentPage = containingFrame.page())
929 currentPage->focusController().setFocusedElement(m_element, &containingF rame); 929 currentPage->focusController().setFocusedElement(m_element, &containingF rame);
930 else 930 else
931 containingFrame.document()->setFocusedElement(m_element); 931 containingFrame.document()->setFocusedElement(m_element, FocusParams(Sel ectionBehaviorOnFocus::None, WebFocusTypeNone, nullptr));
932 } 932 }
933 933
934 void WebPluginContainerImpl::issuePaintInvalidations() 934 void WebPluginContainerImpl::issuePaintInvalidations()
935 { 935 {
936 if (m_pendingInvalidationRect.isEmpty()) 936 if (m_pendingInvalidationRect.isEmpty())
937 return; 937 return;
938 938
939 LayoutBox* layoutObject = toLayoutBox(m_element->layoutObject()); 939 LayoutBox* layoutObject = toLayoutBox(m_element->layoutObject());
940 if (!layoutObject) 940 if (!layoutObject)
941 return; 941 return;
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
989 // frame view. 989 // frame view.
990 computeClipRectsForPlugin(m_element, windowRect, clipRect, unobscuredRec t); 990 computeClipRectsForPlugin(m_element, windowRect, clipRect, unobscuredRec t);
991 } 991 }
992 getPluginOcclusions(m_element, this->parent(), frameRect(), cutOutRects); 992 getPluginOcclusions(m_element, this->parent(), frameRect(), cutOutRects);
993 // Convert to the plugin position. 993 // Convert to the plugin position.
994 for (size_t i = 0; i < cutOutRects.size(); i++) 994 for (size_t i = 0; i < cutOutRects.size(); i++)
995 cutOutRects[i].move(-frameRect().x(), -frameRect().y()); 995 cutOutRects[i].move(-frameRect().x(), -frameRect().y());
996 } 996 }
997 997
998 } // namespace blinkf 998 } // namespace blinkf
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebLocalFrameImpl.cpp ('k') | third_party/WebKit/Source/web/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698