summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/android/ScreenAndroid.cpp
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2009-08-11 17:01:47 +0100
committerBen Murdoch <benm@google.com>2009-08-11 18:21:02 +0100
commit0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (patch)
tree2943df35f62d885c89d01063cc528dd73b480fea /WebCore/platform/android/ScreenAndroid.cpp
parent7e7a70bfa49a1122b2597a1e6367d89eb4035eca (diff)
downloadexternal_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.zip
external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.gz
external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.bz2
Merge in WebKit r47029.
Diffstat (limited to 'WebCore/platform/android/ScreenAndroid.cpp')
-rw-r--r--WebCore/platform/android/ScreenAndroid.cpp27
1 files changed, 1 insertions, 26 deletions
diff --git a/WebCore/platform/android/ScreenAndroid.cpp b/WebCore/platform/android/ScreenAndroid.cpp
index c1e43b0..2439c1f 100644
--- a/WebCore/platform/android/ScreenAndroid.cpp
+++ b/WebCore/platform/android/ScreenAndroid.cpp
@@ -97,31 +97,6 @@ FloatRect screenRect(Widget* page)
return FloatRect(0.0, 0.0, info.w, info.h);
}
-/*
-Scale functions don't seem to be needed. There is no code that
-call them, and they seem to only exist in ports and not in the core
-WebKit code - davidc
-FloatRect usableScreenRect(Widget* page)
-{
- return FloatRect();;
-}
-
-FloatRect scaleScreenRectToPageCoordinates(const FloatRect&, Widget*)
-{
- return FloatRect();;
-}
-
-FloatRect scalePageRectToScreenCoordinates(const FloatRect&, Widget*)
-{
- return FloatRect();;
-}
-
-float scaleFactor(Widget*)
-{
- return 1.0f;
-}
-*/
-
// Similar screenRect, this function is commonly used by javascripts
// to position and resize windows (usually to full screen).
FloatRect screenAvailableRect(Widget*)
@@ -131,4 +106,4 @@ FloatRect screenAvailableRect(Widget*)
return FloatRect(0.0, 0.0, info.w, info.h);
}
-}
+} // namespace WebCore