Title: [135876] trunk/Source/WebCore
- Revision
- 135876
- Author
- allan.jen...@digia.com
- Date
- 2012-11-27 10:30:27 -0800 (Tue, 27 Nov 2012)
Log Message
Unreviewed cleanup.
Remove leftover file that was replaced by PlatformScreenQt.cpp 4 years ago.
* platform/qt/ScreenQt.cpp: Removed.
Modified Paths
Removed Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (135875 => 135876)
--- trunk/Source/WebCore/ChangeLog 2012-11-27 18:16:27 UTC (rev 135875)
+++ trunk/Source/WebCore/ChangeLog 2012-11-27 18:30:27 UTC (rev 135876)
@@ -1,3 +1,11 @@
+2012-11-27 Allan Sandfeld Jensen <allan.jen...@digia.com>
+
+ Unreviewed cleanup.
+
+ Remove leftover file that was replaced by PlatformScreenQt.cpp 4 years ago.
+
+ * platform/qt/ScreenQt.cpp: Removed.
+
2012-11-27 Istiaque Ahmed <lazy...@chromium.org>
freeV8NPObject: Skip trying to remove object from per context data's ObjectMap if the object does not exist in the map.
Deleted: trunk/Source/WebCore/platform/qt/ScreenQt.cpp (135875 => 135876)
--- trunk/Source/WebCore/platform/qt/ScreenQt.cpp 2012-11-27 18:16:27 UTC (rev 135875)
+++ trunk/Source/WebCore/platform/qt/ScreenQt.cpp 2012-11-27 18:30:27 UTC (rev 135876)
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2006 Dirk Mueller <muel...@kde.org>
- * (C) 2006 Nikolas Zimmermann <zimmerm...@kde.org>
- *
- * 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 "Page.h"
-#include "Widget.h"
-
-#include <QApplication>
-#include <QDesktopWidget>
-
-namespace WebCore {
-
-static QWidget* qwidgetForPage(const Page* page)
-{
- Frame* frame = (page ? page->mainFrame() : 0);
- FrameView* frameView = (frame ? frame->view() : 0);
-
- if (!frameView)
- return 0;
-
- return frameView->qwidget();
-}
-
-FloatRect screenRect(const Page* page)
-{
- QWidget* qw = qwidgetForPage(page);
- if (!qw)
- return FloatRect();
-
- // Taken from KGlobalSettings::desktopGeometry
- QDesktopWidget* dw = QApplication::desktop();
- if (!dw)
- return FloatRect();
-
- return IntRect(dw->screenGeometry(qw));
-}
-
-int screenDepth(const Page* page)
-{
- QWidget* qw = qwidgetForPage(page);
- if (!qw)
- return 32;
-
- return qw->depth();
-}
-
-FloatRect usableScreenRect(const Page* page)
-{
- QWidget* qw = qwidgetForPage(page);
- if (!qw)
- return FloatRect();
-
- // Taken from KGlobalSettings::desktopGeometry
- QDesktopWidget* dw = QApplication::desktop();
- if (!dw)
- return FloatRect();
-
- return IntRect(dw->availableGeometry(qw));
-}
-
-float scaleFactor(const Page*)
-{
- return 1.0f;
-}
-
-}
-
-// vim: ts=4 sw=4 et
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
