1 files changed, 14 insertions, 15 deletions

diff --git a/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.cpp b/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.cpp
index 5691c9c..c59a9bb 100644
--- a/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.cpp
+++ b/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.cpp
@@ -220,7 +220,7 @@ void PluginView::stop()
 
 NPError PluginView::getValueStatic(NPNVariable variable, void* value)
 {
-    LOG(Plugin, "PluginView::getValueStatic(%d)", variable);
+    LOG(Plugins, "PluginView::getValueStatic(%d)", variable);
 
     switch (variable) {
     case NPNVToolkit:
@@ -238,7 +238,7 @@ NPError PluginView::getValueStatic(NPNVariable variable, void* value)
 
 NPError PluginView::getValue(NPNVariable variable, void* value)
 {
-    LOG(Plugin, "PluginView::getValue(%d)", variable);
+    LOG(Plugins, "PluginView::getValue(%d)", variable);
 
     switch (variable) {
     case NPNVWindowNPObject: {
@@ -299,7 +299,7 @@ void PluginView::setParent(ScrollView* parent)
 
 void PluginView::show()
 {
-    LOG(Plugin, "PluginView::show()");
+    LOG(Plugins, "PluginView::show()");
 
     setSelfVisible(true);
 
@@ -308,7 +308,7 @@ void PluginView::show()
 
 void PluginView::hide()
 {
-    LOG(Plugin, "PluginView::hide()");
+    LOG(Plugins, "PluginView::hide()");
 
     setSelfVisible(false);
 
@@ -317,7 +317,7 @@ void PluginView::hide()
 
 void PluginView::setFocus()
 {
-    LOG(Plugin, "PluginView::setFocus()");
+    LOG(Plugins, "PluginView::setFocus()");
 
     if (platformPluginWidget())
        platformPluginWidget()->setFocus(Qt::OtherFocusReason);
@@ -397,7 +397,10 @@ void PluginView::updatePluginWidget()
     IntRect oldWindowRect = m_windowRect;
     IntRect oldClipRect = m_clipRect;
 
-    m_windowRect = IntRect(frameView->contentsToWindow(frameRect().location()), frameRect().size());
+    m_windowRect = frameView->contentsToWindow(frameRect());
+    IntPoint offset = topLevelOffsetFor(platformPluginWidget());
+    m_windowRect.move(offset.x(), offset.y());
+
     m_clipRect = windowClipRect();
     m_clipRect.move(-m_windowRect.x(), -m_windowRect.y());
 
@@ -507,9 +510,9 @@ void PluginView::handleMouseEvent(MouseEvent* event)
 
 void PluginView::handleKeyboardEvent(KeyboardEvent* event)
 {
-    LOG(Plugin, "PluginView::handleKeyboardEvent() ----------------- ");
+    LOG(Plugins, "PluginView::handleKeyboardEvent() ----------------- ");
 
-    LOG(Plugin, "PV::hKE(): KE.keyCode: 0x%02X, KE.charCode: %d",
+    LOG(Plugins, "PV::hKE(): KE.keyCode: 0x%02X, KE.charCode: %d",
             event->keyCode(), event->charCode());
 
     EventRecord record;
@@ -545,7 +548,7 @@ void PluginView::handleKeyboardEvent(KeyboardEvent* event)
 
     WTF::RetainPtr<CFStringRef> cfText(WTF::AdoptCF, text.createCFString());
 
-    LOG(Plugin, "PV::hKE(): PKE.text: %s, PKE.unmodifiedText: %s, PKE.keyIdentifier: %s",
+    LOG(Plugins, "PV::hKE(): PKE.text: %s, PKE.unmodifiedText: %s, PKE.keyIdentifier: %s",
             text.ascii().data(), platformEvent->unmodifiedText().ascii().data(),
             platformEvent->keyIdentifier().ascii().data());
 
@@ -561,9 +564,9 @@ void PluginView::handleKeyboardEvent(KeyboardEvent* event)
     record.message = ((keyCode & 0xFF) << 8) | (charCodes[0] & 0xFF);
     record.when = TickCount();
 
-    LOG(Plugin, "PV::hKE(): record.modifiers: %d", record.modifiers);
+    LOG(Plugins, "PV::hKE(): record.modifiers: %d", record.modifiers);
 
-    LOG(Plugin, "PV::hKE(): PKE.qtEvent()->nativeVirtualKey: 0x%02X, charCode: %d",
+    LOG(Plugins, "PV::hKE(): PKE.qtEvent()->nativeVirtualKey: 0x%02X, charCode: %d",
                keyCode, int(uchar(charCodes[0])));
 
     if (!dispatchNPEvent(record))
@@ -624,10 +627,6 @@ Point PluginView::globalMousePosForPlugin() const
     Point pos;
     GetGlobalMouse(&pos);
 
-    IntPoint offset = topLevelOffsetFor(platformPluginWidget());
-    pos.h -= offset.x();
-    pos.v -= offset.y();
-
     float scaleFactor = tigerOrBetter() ? HIGetScaleFactor() : 1;
 
     pos.h = short(pos.h * scaleFactor);