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

Side by Side Diff: Source/WebKit/chromium/src/WebPluginContainerImpl.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/WebKit/chromium/src/WebPluginContainerImpl.h ('k') | Source/WebKit/mac/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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 Widget::frameRectsChanged(); 215 Widget::frameRectsChanged();
216 reportGeometry(); 216 reportGeometry();
217 } 217 }
218 218
219 void WebPluginContainerImpl::widgetPositionsUpdated() 219 void WebPluginContainerImpl::widgetPositionsUpdated()
220 { 220 {
221 Widget::widgetPositionsUpdated(); 221 Widget::widgetPositionsUpdated();
222 reportGeometry(); 222 reportGeometry();
223 } 223 }
224 224
225 void WebPluginContainerImpl::clipRectChanged()
226 {
227 reportGeometry();
228 }
229
225 void WebPluginContainerImpl::setParentVisible(bool parentVisible) 230 void WebPluginContainerImpl::setParentVisible(bool parentVisible)
226 { 231 {
227 // We override this function to make sure that geometry updates are sent 232 // We override this function to make sure that geometry updates are sent
228 // over to the plugin. For e.g. when a plugin is instantiated it does not 233 // over to the plugin. For e.g. when a plugin is instantiated it does not
229 // have a valid parent. As a result the first geometry update from webkit 234 // have a valid parent. As a result the first geometry update from webkit
230 // is ignored. This function is called when the plugin eventually gets a 235 // is ignored. This function is called when the plugin eventually gets a
231 // parent. 236 // parent.
232 237
233 if (isParentVisible() == parentVisible) 238 if (isParentVisible() == parentVisible)
234 return; // No change. 239 return; // No change.
(...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after
884 // Take our element and get the clip rect from the enclosing layer and 889 // Take our element and get the clip rect from the enclosing layer and
885 // frame view. 890 // frame view.
886 clipRect.intersect( 891 clipRect.intersect(
887 m_element->document()->view()->windowClipRectForFrameOwner(m_element , true)); 892 m_element->document()->view()->windowClipRectForFrameOwner(m_element , true));
888 } 893 }
889 894
890 return clipRect; 895 return clipRect;
891 } 896 }
892 897
893 } // namespace WebKit 898 } // namespace WebKit
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/src/WebPluginContainerImpl.h ('k') | Source/WebKit/mac/ChangeLog » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698