Commit 76f34f6b authored by hyatt's avatar hyatt

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
parent 07d9b679
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "Page.h" #include "Page.h"
#include "Frame.h" #include "Frame.h"
#include "IntRect.h" #include "FloatRect.h"
#include <windows.h> #include <windows.h>
namespace WebCore { namespace WebCore {
...@@ -62,7 +62,7 @@ Widget* Page::widget() const ...@@ -62,7 +62,7 @@ Widget* Page::widget() const
return m_widget; return m_widget;
} }
IntRect Page::windowRect() const FloatRect Page::windowRect() const
{ {
HWND windowHandle = rootWindowForFrame(mainFrame()); HWND windowHandle = rootWindowForFrame(mainFrame());
if (!windowHandle) if (!windowHandle)
...@@ -72,7 +72,7 @@ IntRect Page::windowRect() const ...@@ -72,7 +72,7 @@ IntRect Page::windowRect() const
return rect; return rect;
} }
void Page::setWindowRect(const IntRect& r) void Page::setWindowRect(const FloatRect& r)
{ {
HWND windowHandle = rootWindowForFrame(mainFrame()); HWND windowHandle = rootWindowForFrame(mainFrame());
if (!windowHandle) if (!windowHandle)
......
...@@ -23,9 +23,11 @@ ...@@ -23,9 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "config.h"
#include "Screen.h" #include "Screen.h"
#include "IntRect.h" #include "IntRect.h"
#include "FloatRect.h"
#include "Widget.h" #include "Widget.h"
#include <windows.h> #include <windows.h>
...@@ -50,7 +52,7 @@ static MONITORINFOEX monitorInfoForWidget(Widget* widget) ...@@ -50,7 +52,7 @@ static MONITORINFOEX monitorInfoForWidget(Widget* widget)
return info; return info;
} }
IntRect WebCore::screenRect(Widget* widget) FloatRect WebCore::screenRect(Widget* widget)
{ {
return monitorInfoForWidget(widget).rcMonitor; return monitorInfoForWidget(widget).rcMonitor;
} }
...@@ -64,7 +66,7 @@ int WebCore::screenDepth(Widget* widget) ...@@ -64,7 +66,7 @@ int WebCore::screenDepth(Widget* widget)
return deviceInfo.dmBitsPerPel; return deviceInfo.dmBitsPerPel;
} }
IntRect WebCore::usableScreenRect(Widget* widget) FloatRect WebCore::usableScreenRect(Widget* widget)
{ {
return monitorInfoForWidget(widget).rcWork; return monitorInfoForWidget(widget).rcWork;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment