diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-07-13 17:08:06 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-07-13 17:08:06 +0200 |
commit | d077a3eac8f0401a18913471e08709e74552c507 (patch) | |
tree | ad83af83620995dd79ebb12abd35d85282b95c6f /src/3rdparty/webkit/WebCore/plugins | |
parent | 6744a0d6095277e1876694cc8fe42b41997c6c31 (diff) | |
parent | 8f65472671406ad5881b119ba32b075b828bbb1a (diff) |
Merge commit 'origin/4.5'
Conflicts:
src/3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp
src/3rdparty/webkit/JavaScriptCore/generated/Grammar.h
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/generated/CSSGrammar.cpp
src/3rdparty/webkit/WebCore/generated/CSSGrammar.h
src/3rdparty/webkit/WebCore/generated/Grammar.cpp
src/3rdparty/webkit/WebCore/generated/Grammar.h
src/3rdparty/webkit/WebCore/generated/XPathGrammar.cpp
src/3rdparty/webkit/WebCore/generated/XPathGrammar.h
src/3rdparty/webkit/WebKit/qt/ChangeLog
tools/linguist/lrelease/main.cpp
tools/linguist/lupdate/main.cpp
tools/linguist/shared/profileevaluator.cpp
Diffstat (limited to 'src/3rdparty/webkit/WebCore/plugins')
-rw-r--r-- | src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.cpp b/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.cpp index c59a9bb96f..ce0f859d1c 100644 --- a/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.cpp +++ b/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.cpp @@ -373,10 +373,10 @@ void PluginView::setNPWindowIfNeeded() m_npWindow.height = m_windowRect.height(); // TODO: (also clip against scrollbars, etc.) - m_npWindow.clipRect.left = 0; - m_npWindow.clipRect.top = 0; - m_npWindow.clipRect.right = m_windowRect.width(); - m_npWindow.clipRect.bottom = m_windowRect.height(); + m_npWindow.clipRect.left = max(0, m_windowRect.x()); + m_npWindow.clipRect.top = max(0, m_windowRect.y()); + m_npWindow.clipRect.right = m_windowRect.x() + m_windowRect.width(); + m_npWindow.clipRect.bottom = m_windowRect.y() + m_windowRect.height(); PluginView::setCurrentPluginView(this); JSC::JSLock::DropAllLocks dropAllLocks(false); |