diff options
author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/plugins/win | |
parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/plugins/win')
-rw-r--r-- | Source/WebCore/plugins/win/PluginPackageWin.cpp | 2 | ||||
-rw-r--r-- | Source/WebCore/plugins/win/PluginViewWin.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/WebCore/plugins/win/PluginPackageWin.cpp b/Source/WebCore/plugins/win/PluginPackageWin.cpp index 74bd2a9..e06d1f4 100644 --- a/Source/WebCore/plugins/win/PluginPackageWin.cpp +++ b/Source/WebCore/plugins/win/PluginPackageWin.cpp @@ -168,7 +168,7 @@ bool PluginPackage::fetchInfo() if (versionInfoSize == 0) return false; - OwnArrayPtr<char> versionInfoData(new char[versionInfoSize]); + OwnArrayPtr<char> versionInfoData = adoptArrayPtr(new char[versionInfoSize]); if (!GetFileVersionInfoW(const_cast<UChar*>(m_path.charactersWithNullTermination()), 0, versionInfoSize, versionInfoData.get())) diff --git a/Source/WebCore/plugins/win/PluginViewWin.cpp b/Source/WebCore/plugins/win/PluginViewWin.cpp index 3cd1902..208121e 100644 --- a/Source/WebCore/plugins/win/PluginViewWin.cpp +++ b/Source/WebCore/plugins/win/PluginViewWin.cpp @@ -448,7 +448,7 @@ void PluginView::updatePluginWidget() rgn = ::CreateRectRgn(0, 0, 0, 0); ::SetWindowRgn(platformPluginWidget(), rgn, FALSE); } else { - rgn = ::CreateRectRgn(m_clipRect.x(), m_clipRect.y(), m_clipRect.right(), m_clipRect.bottom()); + rgn = ::CreateRectRgn(m_clipRect.x(), m_clipRect.y(), m_clipRect.maxX(), m_clipRect.maxY()); ::SetWindowRgn(platformPluginWidget(), rgn, TRUE); } @@ -456,7 +456,7 @@ void PluginView::updatePluginWidget() ::MoveWindow(platformPluginWidget(), m_windowRect.x(), m_windowRect.y(), m_windowRect.width(), m_windowRect.height(), TRUE); if (clipToZeroRect) { - rgn = ::CreateRectRgn(m_clipRect.x(), m_clipRect.y(), m_clipRect.right(), m_clipRect.bottom()); + rgn = ::CreateRectRgn(m_clipRect.x(), m_clipRect.y(), m_clipRect.maxX(), m_clipRect.maxY()); ::SetWindowRgn(platformPluginWidget(), rgn, TRUE); } @@ -896,7 +896,7 @@ bool PluginView::platformGetValue(NPNVariable variable, void* value, NPError* re void PluginView::invalidateRect(const IntRect& rect) { if (m_isWindowed) { - RECT invalidRect = { rect.x(), rect.y(), rect.right(), rect.bottom() }; + RECT invalidRect = { rect.x(), rect.y(), rect.maxX(), rect.maxY() }; ::InvalidateRect(platformPluginWidget(), &invalidRect, false); return; } @@ -914,7 +914,7 @@ void PluginView::invalidateRect(NPRect* rect) IntRect r(rect->left, rect->top, rect->right - rect->left, rect->bottom - rect->top); if (m_isWindowed) { - RECT invalidRect = { r.x(), r.y(), r.right(), r.bottom() }; + RECT invalidRect = { r.x(), r.y(), r.maxX(), r.maxY() }; InvalidateRect(platformPluginWidget(), &invalidRect, FALSE); } else { if (m_plugin->quirks().contains(PluginQuirkThrottleInvalidate)) { |