[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 682a324c995ea5459957a6fac85f41dcea9fafe7
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 2 12:27:19 2010 +0000

    2010-02-02  Kwang Yul Seo  <skyul at company100.net>
    
            Reviewed by Eric Seidel.
    
            [BREWMP] Port Screen
            https://bugs.webkit.org/show_bug.cgi?id=34299
    
            Get the screen size and depth from the main display bitmap.
    
            * platform/brew/ScreenBrew.cpp: Added.
            (WebCore::getDisplayInfo):
            (WebCore::screenRect):
            (WebCore::screenAvailableRect):
            (WebCore::screenDepth):
            (WebCore::screenDepthPerComponent):
            (WebCore::screenIsMonochrome):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54226 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bedb80b..ca4ead9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,23 @@
 
         Reviewed by Eric Seidel.
 
+        [BREWMP] Port Screen
+        https://bugs.webkit.org/show_bug.cgi?id=34299
+
+        Get the screen size and depth from the main display bitmap.
+
+        * platform/brew/ScreenBrew.cpp: Added.
+        (WebCore::getDisplayInfo):
+        (WebCore::screenRect):
+        (WebCore::screenAvailableRect):
+        (WebCore::screenDepth):
+        (WebCore::screenDepthPerComponent):
+        (WebCore::screenIsMonochrome):
+
+2010-02-02  Kwang Yul Seo  <skyul at company100.net>
+
+        Reviewed by Eric Seidel.
+
         [BREWMP] Port LocalizedStrings
         https://bugs.webkit.org/show_bug.cgi?id=34257
 
diff --git a/WebCore/platform/brew/ScreenBrew.cpp b/WebCore/platform/brew/ScreenBrew.cpp
new file mode 100644
index 0000000..b141b34
--- /dev/null
+++ b/WebCore/platform/brew/ScreenBrew.cpp
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2009 Company 100, Inc. 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 "Screen.h"
+
+#include "FloatRect.h"
+#include "Frame.h"
+#include "FrameView.h"
+#include "IntRect.h"
+#include "NotImplemented.h"
+#include "Page.h"
+#include "Widget.h"
+
+#include <AEEAppGen.h>
+#include <AEEStdLib.h>
+
+namespace WebCore {
+
+struct DisplayInfo {
+    int width;
+    int height;
+    int depth;
+};
+
+static void getDisplayInfo(DisplayInfo& info)
+{
+    IDisplay* display = reinterpret_cast<AEEApplet*>(GETAPPINSTANCE())->m_pIDisplay;
+    IBitmap* bitmap = IDisplay_GetDestination(display);
+    ASSERT(bitmap);
+
+    AEEBitmapInfo bitmapInfo;
+    IBitmap_GetInfo(bitmap, &bitmapInfo, sizeof(AEEBitmapInfo));
+
+    info.width  = bitmapInfo.cx;
+    info.height = bitmapInfo.cy;
+    info.depth  = bitmapInfo.nDepth;
+
+    IBitmap_Release(bitmap);
+}
+
+FloatRect screenRect(Widget*)
+{
+    DisplayInfo info;
+    getDisplayInfo(info);
+
+    return FloatRect(0, 0, info.width, info.height);
+}
+
+FloatRect screenAvailableRect(Widget* widget)
+{
+    return screenRect(widget);
+}
+
+int screenDepth(Widget*)
+{
+    DisplayInfo info;
+    getDisplayInfo(info);
+
+    return info.depth;
+}
+
+int screenDepthPerComponent(Widget* widget)
+{
+    return screenDepth(widget);
+}
+
+bool screenIsMonochrome(Widget*)
+{
+    return false;
+}
+
+} // namespace WebCore
+

-- 
WebKit Debian packaging