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/PlatformScreenGdk.cpp b/WebCore/platform/gdk/PlatformScreenGdk.cpp
new file mode 100644
index 0000000..6604be7
--- /dev/null
+++ b/WebCore/platform/gdk/PlatformScreenGdk.cpp
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2006 Michael Emmel mike.emmel@gmail.com
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "PlatformScreen.h"
+
+#include "NotImplemented.h"
+#include "Widget.h"
+#include <gdk/gdk.h>
+#include <stdio.h>
+#include <wtf/Assertions.h>
+
+namespace WebCore {
+
+int screenDepth(Widget* widget)
+{
+ ASSERT(widget->drawable());
+
+ gint dummy, depth;
+ gdk_window_get_geometry(widget->drawable(), &dummy, &dummy, &dummy, &dummy, &depth);
+ return depth;
+}
+
+int screenDepthPerComponent(Widget*)
+{
+ notImplemented();
+ return 8;
+}
+
+bool screenIsMonochrome(Widget*)
+{
+ notImplemented();
+ return false;
+}
+
+FloatRect screenRect(Widget*)
+{
+ notImplemented();
+ return FloatRect();
+}
+
+FloatRect screenAvailableRect(Widget*)
+{
+ notImplemented();
+ return FloatRect();
+}
+
+} // namespace WebCore