From 76f34f6be47d55325763c9120e07a91afa9af31c Mon Sep 17 00:00:00 2001 From: hyatt Date: Wed, 31 May 2006 20:05:01 +0000 Subject: [PATCH] Fix Win32 build bustage from Screen/Page FloatRect conversion git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14649 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- WebCore/bridge/win/PageWin.cpp | 6 +++--- WebCore/platform/win/ScreenWin.cpp | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/WebCore/bridge/win/PageWin.cpp b/WebCore/bridge/win/PageWin.cpp index a46fdad4e10..b20c84d7681 100644 --- a/WebCore/bridge/win/PageWin.cpp +++ b/WebCore/bridge/win/PageWin.cpp @@ -27,7 +27,7 @@ #include "Page.h" #include "Frame.h" -#include "IntRect.h" +#include "FloatRect.h" #include namespace WebCore { @@ -62,7 +62,7 @@ Widget* Page::widget() const return m_widget; } -IntRect Page::windowRect() const +FloatRect Page::windowRect() const { HWND windowHandle = rootWindowForFrame(mainFrame()); if (!windowHandle) @@ -72,7 +72,7 @@ IntRect Page::windowRect() const return rect; } -void Page::setWindowRect(const IntRect& r) +void Page::setWindowRect(const FloatRect& r) { HWND windowHandle = rootWindowForFrame(mainFrame()); if (!windowHandle) diff --git a/WebCore/platform/win/ScreenWin.cpp b/WebCore/platform/win/ScreenWin.cpp index 33633866382..7657ee4e97e 100644 --- a/WebCore/platform/win/ScreenWin.cpp +++ b/WebCore/platform/win/ScreenWin.cpp @@ -23,9 +23,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "config.h" #include "Screen.h" #include "IntRect.h" +#include "FloatRect.h" #include "Widget.h" #include @@ -50,7 +52,7 @@ static MONITORINFOEX monitorInfoForWidget(Widget* widget) return info; } -IntRect WebCore::screenRect(Widget* widget) +FloatRect WebCore::screenRect(Widget* widget) { return monitorInfoForWidget(widget).rcMonitor; } @@ -64,7 +66,7 @@ int WebCore::screenDepth(Widget* widget) return deviceInfo.dmBitsPerPel; } -IntRect WebCore::usableScreenRect(Widget* widget) +FloatRect WebCore::usableScreenRect(Widget* widget) { return monitorInfoForWidget(widget).rcWork; } -- GitLab