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

Side by Side Diff: Source/WebCore/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/WebCore/plugins/PluginView.h ('k') | Source/WebCore/rendering/RenderWidget.cpp » ('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) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2008 Collabora Ltd. All rights reserved. 3 * Copyright (C) 2008 Collabora Ltd. All rights reserved.
4 * Copyright (C) 2010 Girish Ramakrishnan <girish@forwardbias.in> 4 * Copyright (C) 2010 Girish Ramakrishnan <girish@forwardbias.in>
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. 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 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 if (m_mode == NP_FULL || !m_isWindowed) 151 if (m_mode == NP_FULL || !m_isWindowed)
152 setNPWindowRect(rect); 152 setNPWindowRect(rect);
153 #endif 153 #endif
154 } 154 }
155 155
156 void PluginView::frameRectsChanged() 156 void PluginView::frameRectsChanged()
157 { 157 {
158 updatePluginWidget(); 158 updatePluginWidget();
159 } 159 }
160 160
161 void PluginView::clipRectChanged()
162 {
163 updatePluginWidget();
164 }
165
161 void PluginView::handleEvent(Event* event) 166 void PluginView::handleEvent(Event* event)
162 { 167 {
163 if (!m_plugin || m_isWindowed) 168 if (!m_plugin || m_isWindowed)
164 return; 169 return;
165 170
166 // Protect the plug-in from deletion while dispatching the event. 171 // Protect the plug-in from deletion while dispatching the event.
167 RefPtr<PluginView> protect(this); 172 RefPtr<PluginView> protect(this);
168 173
169 if (event->isMouseEvent()) 174 if (event->isMouseEvent())
170 handleMouseEvent(static_cast<MouseEvent*>(event)); 175 handleMouseEvent(static_cast<MouseEvent*>(event));
(...skipping 1354 matching lines...) Expand 10 before | Expand all | Expand 10 after
1525 setCallingPlugin(true); 1530 setCallingPlugin(true);
1526 NPBool value = privateBrowsingEnabled; 1531 NPBool value = privateBrowsingEnabled;
1527 setValue(m_instance, NPNVprivateModeBool, &value); 1532 setValue(m_instance, NPNVprivateModeBool, &value);
1528 setCallingPlugin(false); 1533 setCallingPlugin(false);
1529 PluginView::setCurrentPluginView(0); 1534 PluginView::setCurrentPluginView(0);
1530 } 1535 }
1531 1536
1532 } // namespace WebCore 1537 } // namespace WebCore
1533 1538
1534 #endif // ENABLE(NETSCAPE_PLUGIN_API) 1539 #endif // ENABLE(NETSCAPE_PLUGIN_API)
OLDNEW
« no previous file with comments | « Source/WebCore/plugins/PluginView.h ('k') | Source/WebCore/rendering/RenderWidget.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698