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

Side by Side Diff: Source/WebKit2/WebProcess/Plugins/PluginView.cpp

Issue 12408009: Merge 144236 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 9 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
« no previous file with comments | « Source/WebKit2/WebProcess/Plugins/PluginView.h ('k') | Tools/ChangeLog » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2010, 2012 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 717 matching lines...) Expand 10 before | Expand all | Expand 10 after
728 728
729 m_plugin->paint(context, paintRect); 729 m_plugin->paint(context, paintRect);
730 } 730 }
731 731
732 void PluginView::frameRectsChanged() 732 void PluginView::frameRectsChanged()
733 { 733 {
734 Widget::frameRectsChanged(); 734 Widget::frameRectsChanged();
735 viewGeometryDidChange(); 735 viewGeometryDidChange();
736 } 736 }
737 737
738 void PluginView::clipRectChanged()
739 {
740 viewGeometryDidChange();
741 }
742
738 void PluginView::setParent(ScrollView* scrollView) 743 void PluginView::setParent(ScrollView* scrollView)
739 { 744 {
740 Widget::setParent(scrollView); 745 Widget::setParent(scrollView);
741 746
742 if (scrollView) 747 if (scrollView)
743 initializePlugin(); 748 initializePlugin();
744 } 749 }
745 750
746 unsigned PluginView::countFindMatches(const String& target, WebCore::FindOptions options, unsigned maxMatchCount) 751 unsigned PluginView::countFindMatches(const String& target, WebCore::FindOptions options, unsigned maxMatchCount)
747 { 752 {
(...skipping 875 matching lines...) Expand 10 before | Expand all | Expand 10 after
1623 return; 1628 return;
1624 1629
1625 if (m_didReceiveUserInteraction) 1630 if (m_didReceiveUserInteraction)
1626 return; 1631 return;
1627 1632
1628 m_didReceiveUserInteraction = true; 1633 m_didReceiveUserInteraction = true;
1629 WebProcess::shared().plugInDidReceiveUserInteraction(m_pluginElement->plugIn OriginHash()); 1634 WebProcess::shared().plugInDidReceiveUserInteraction(m_pluginElement->plugIn OriginHash());
1630 } 1635 }
1631 1636
1632 } // namespace WebKit 1637 } // namespace WebKit
OLDNEW
« no previous file with comments | « Source/WebKit2/WebProcess/Plugins/PluginView.h ('k') | Tools/ChangeLog » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698