Title: [98907] trunk/Source/WebKit2
- Revision
- 98907
- Author
- ander...@apple.com
- Date
- 2011-10-31 16:38:27 -0700 (Mon, 31 Oct 2011)
Log Message
Remove some uses of m_frameRectInWindowCoordinates from PluginProxy
https://bugs.webkit.org/show_bug.cgi?id=71252
Reviewed by Darin Adler.
* WebProcess/Plugins/PluginProxy.cpp:
(WebKit::PluginProxy::paint):
(WebKit::PluginProxy::geometryDidChange):
(WebKit::PluginProxy::updateBackingStore):
(WebKit::PluginProxy::pluginBounds):
* WebProcess/Plugins/PluginProxy.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (98906 => 98907)
--- trunk/Source/WebKit2/ChangeLog 2011-10-31 23:34:02 UTC (rev 98906)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-31 23:38:27 UTC (rev 98907)
@@ -1,5 +1,19 @@
2011-10-31 Anders Carlsson <ander...@apple.com>
+ Remove some uses of m_frameRectInWindowCoordinates from PluginProxy
+ https://bugs.webkit.org/show_bug.cgi?id=71252
+
+ Reviewed by Darin Adler.
+
+ * WebProcess/Plugins/PluginProxy.cpp:
+ (WebKit::PluginProxy::paint):
+ (WebKit::PluginProxy::geometryDidChange):
+ (WebKit::PluginProxy::updateBackingStore):
+ (WebKit::PluginProxy::pluginBounds):
+ * WebProcess/Plugins/PluginProxy.h:
+
+2011-10-31 Anders Carlsson <ander...@apple.com>
+
Implement PluginProxy::geometryDidChange
https://bugs.webkit.org/show_bug.cgi?id=71251
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp (98906 => 98907)
--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2011-10-31 23:34:02 UTC (rev 98906)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2011-10-31 23:38:27 UTC (rev 98907)
@@ -143,7 +143,7 @@
graphicsContext->applyDeviceScaleFactor(contentsScaleFactor());
graphicsContext->setCompositeOperation(CompositeCopy);
- m_pluginBackingStore->paint(*graphicsContext, contentsScaleFactor(), IntPoint(), IntRect(0, 0, m_frameRectInWindowCoordinates.width(), m_frameRectInWindowCoordinates.height()));
+ m_pluginBackingStore->paint(*graphicsContext, contentsScaleFactor(), IntPoint(), pluginBounds());
m_pluginBackingStoreContainsValidData = true;
}
@@ -180,7 +180,7 @@
{
ASSERT(m_isStarted);
- if (m_frameRectInWindowCoordinates.isEmpty() || !needsBackingStore()) {
+ if (m_pluginSize.isEmpty() || !needsBackingStore()) {
ShareableBitmap::Handle pluginBackingStoreHandle;
m_connection->connection()->send(Messages::PluginControllerProxy::GeometryDidChange(m_frameRectInWindowCoordinates, m_clipRectInWindowCoordinates, contentsScaleFactor(), pluginBackingStoreHandle), m_pluginInstanceID, CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply);
return;
@@ -462,7 +462,7 @@
bool PluginProxy::updateBackingStore()
{
- IntSize backingStoreSize = m_frameRectInWindowCoordinates.size();
+ IntSize backingStoreSize = m_pluginSize;
backingStoreSize.scale(contentsScaleFactor());
if (!m_backingStore) {
@@ -490,6 +490,11 @@
return windowNPObjectID;
}
+IntRect PluginProxy::pluginBounds()
+{
+ return IntRect(IntPoint(), m_pluginSize);
+}
+
void PluginProxy::getPluginElementNPObject(uint64_t& pluginElementNPObjectID)
{
NPObject* pluginElementNPObject = controller()->pluginElementNPObject();
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h (98906 => 98907)
--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h 2011-10-31 23:34:02 UTC (rev 98906)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h 2011-10-31 23:38:27 UTC (rev 98907)
@@ -115,6 +115,7 @@
bool needsBackingStore() const;
bool updateBackingStore();
uint64_t windowNPObjectID();
+ WebCore::IntRect pluginBounds();
void geometryDidChange();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
