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

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

Issue 12475008: Merge 144236 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
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 710 matching lines...) Expand 10 before | Expand all | Expand 10 after
721 721
722 m_plugin->paint(context, paintRect); 722 m_plugin->paint(context, paintRect);
723 } 723 }
724 724
725 void PluginView::frameRectsChanged() 725 void PluginView::frameRectsChanged()
726 { 726 {
727 Widget::frameRectsChanged(); 727 Widget::frameRectsChanged();
728 viewGeometryDidChange(); 728 viewGeometryDidChange();
729 } 729 }
730 730
731 void PluginView::clipRectChanged()
732 {
733 viewGeometryDidChange();
734 }
735
731 void PluginView::setParent(ScrollView* scrollView) 736 void PluginView::setParent(ScrollView* scrollView)
732 { 737 {
733 Widget::setParent(scrollView); 738 Widget::setParent(scrollView);
734 739
735 if (scrollView) 740 if (scrollView)
736 initializePlugin(); 741 initializePlugin();
737 } 742 }
738 743
739 PassOwnPtr<WebEvent> PluginView::createWebEvent(MouseEvent* event) const 744 PassOwnPtr<WebEvent> PluginView::createWebEvent(MouseEvent* event) const
740 { 745 {
(...skipping 843 matching lines...) Expand 10 before | Expand all | Expand 10 after
1584 } 1589 }
1585 1590
1586 bool PluginView::shouldAlwaysAutoStart() const 1591 bool PluginView::shouldAlwaysAutoStart() const
1587 { 1592 {
1588 if (!m_plugin) 1593 if (!m_plugin)
1589 return PluginViewBase::shouldAlwaysAutoStart(); 1594 return PluginViewBase::shouldAlwaysAutoStart();
1590 return m_plugin->shouldAlwaysAutoStart(); 1595 return m_plugin->shouldAlwaysAutoStart();
1591 } 1596 }
1592 1597
1593 } // namespace WebKit 1598 } // 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