summaryrefslogtreecommitdiffstats
path: root/WebCore/platform
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2011-02-10 09:11:10 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-02-10 09:11:10 -0800
commitb120935ebd0cf2664978e888ac5d2d0c33ac818a (patch)
tree17bf9b07d445f2201d69781131d92312d79964c2 /WebCore/platform
parente2233abc7c8574970b34ef0e83ff994e3b41456d (diff)
parent3a7568b5aa8ee4ef6ba961eae690b498f5ba8e9e (diff)
downloadexternal_webkit-b120935ebd0cf2664978e888ac5d2d0c33ac818a.zip
external_webkit-b120935ebd0cf2664978e888ac5d2d0c33ac818a.tar.gz
external_webkit-b120935ebd0cf2664978e888ac5d2d0c33ac818a.tar.bz2
Merge changes I0c422ecd,Ia06decf9
* changes: Improve the fixed element position calculation Revert "A temp WAR for fixed element position update"
Diffstat (limited to 'WebCore/platform')
-rw-r--r--WebCore/platform/android/PlatformBridge.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/platform/android/PlatformBridge.h b/WebCore/platform/android/PlatformBridge.h
index 3f559d5..faa823e 100644
--- a/WebCore/platform/android/PlatformBridge.h
+++ b/WebCore/platform/android/PlatformBridge.h
@@ -149,8 +149,8 @@ public:
static int memoryUsageMB();
static int actualMemoryUsageMB();
- static int visibleScreenWidth(const FrameView*);
- static int visibleScreenHeight(const FrameView*);
+ static int screenWidthInDocCoord(const FrameView*);
+ static int screenHeightInDocCoord(const FrameView*);
};
}