LayoutTests:
Reviewed by Geoff.
Updates tests for http://bugs.webkit.org/show_bug.cgi?id=14193
Move the Screen object out of the JS bindings
* fast/dom/Window/window-appendages-cleared-expected.txt:
* fast/dom/Window/window-properties-expected.txt:
WebCore:
Reviewed by Geoff.
Patch for http://bugs.webkit.org/show_bug.cgi?id=14193
Move the Screen object out of the JS bindings
- Renames Screen.h to PlatformScreen.h to accommodate new class.
- Autogenerates JSScreen.
* DerivedSources.make:
* WebCore.pro:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/kjs_window.cpp:
(KJS::WindowPrivate::WindowPrivate):
(KJS::Window::mark):
(KJS::Window::getValueProperty):
(KJS::Window::clearHelperObjectProperties):
* bindings/js/kjs_window.h:
(KJS::Window::):
* css/MediaQueryEvaluator.cpp:
* page/DOMWindow.cpp:
(WebCore::DOMWindow::DOMWindow):
(WebCore::DOMWindow::~DOMWindow):
(WebCore::DOMWindow::frame):
(WebCore::DOMWindow::disconnectFrame):
(WebCore::DOMWindow::screen):
* page/DOMWindow.h:
* page/DOMWindow.idl:
* page/Screen.cpp: Added.
(WebCore::Screen::Screen):
(WebCore::Screen::disconnectFrame):
(WebCore::Screen::height):
(WebCore::Screen::width):
(WebCore::Screen::colorDepth):
(WebCore::Screen::pixelDepth):
(WebCore::Screen::availLeft):
(WebCore::Screen::availTop):
(WebCore::Screen::availHeight):
(WebCore::Screen::availWidth):
* page/Screen.h: Added.
* page/Screen.idl: Added.
* page/mac/WebCoreFrameBridge.mm:
* platform/PlatformScreen.h: Copied from WebCore/platform/Screen.h.
* platform/Screen.h: Removed.
* platform/gdk/PlatformScreenGdk.cpp: Copied from WebCore/platform/gdk/ScreenGdk.cpp.
* platform/gdk/ScreenGdk.cpp: Removed.
* platform/mac/PlatformMouseEventMac.mm:
* platform/mac/PlatformScreenMac.mm: Copied from WebCore/platform/mac/ScreenMac.mm.
* platform/mac/ScreenMac.mm: Removed.
* platform/qt/PlatformScreenQt.cpp: Added.
(WebCore::WebCore::screenDepth):
(WebCore::WebCore::screenDepthPerComponent):
(WebCore::WebCore::screenIsMonochrome):
(WebCore::WebCore::screenRect):
(WebCore::WebCore::screenAvailableRect):
* platform/qt/TemporaryLinkStubs.cpp:
* platform/win/PlatformScreenWin.cpp: Copied from WebCore/platform/win/ScreenWin.cpp.
* platform/win/ScreenWin.cpp: Removed.
* rendering/RenderObject.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@23576 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/platform/gdk/ScreenGdk.cpp b/WebCore/platform/gdk/PlatformScreenGdk.cpp
similarity index 97%
rename from WebCore/platform/gdk/ScreenGdk.cpp
rename to WebCore/platform/gdk/PlatformScreenGdk.cpp
index a667c63..6604be7 100644
--- a/WebCore/platform/gdk/ScreenGdk.cpp
+++ b/WebCore/platform/gdk/PlatformScreenGdk.cpp
@@ -26,13 +26,13 @@
*/
#include "config.h"
-#include "Screen.h"
-#include "Widget.h"
+#include "PlatformScreen.h"
#include "NotImplemented.h"
-#include <wtf/Assertions.h>
+#include "Widget.h"
#include <gdk/gdk.h>
#include <stdio.h>
+#include <wtf/Assertions.h>
namespace WebCore {
@@ -69,4 +69,4 @@
return FloatRect();
}
-}
+} // namespace WebCore