diff options
| author | Steve Block <steveblock@google.com> | 2009-12-17 10:01:16 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-17 10:01:16 -0800 |
| commit | 8f75286f8f97df46e2fb2411460a5efb3fc9b083 (patch) | |
| tree | eca591661d5d9fc0fc58e2d2a2d11dfc8c406ccc /WebCore/platform/Widget.cpp | |
| parent | e4b2e0b8a34bdde6f219c2d755af174569fa728f (diff) | |
| parent | 4dd98cc27e25e6c3104672f50749132d2236461b (diff) | |
| download | external_webkit-8f75286f8f97df46e2fb2411460a5efb3fc9b083.zip external_webkit-8f75286f8f97df46e2fb2411460a5efb3fc9b083.tar.gz external_webkit-8f75286f8f97df46e2fb2411460a5efb3fc9b083.tar.bz2 | |
am 4dd98cc2: am aad6f24e: Merge webkit.org at r51976 : Fix general conflicts.
Merge commit '4dd98cc27e25e6c3104672f50749132d2236461b'
* commit '4dd98cc27e25e6c3104672f50749132d2236461b':
Merge webkit.org at r51976 : Fix general conflicts.
Diffstat (limited to 'WebCore/platform/Widget.cpp')
| -rw-r--r-- | WebCore/platform/Widget.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/WebCore/platform/Widget.cpp b/WebCore/platform/Widget.cpp index 2213a11..6196548 100644 --- a/WebCore/platform/Widget.cpp +++ b/WebCore/platform/Widget.cpp @@ -127,11 +127,7 @@ IntPoint Widget::convertFromContainingWindowToRoot(const Widget*, const IntPoint } #endif -<<<<<<< HEAD:WebCore/platform/Widget.cpp -#if !PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(ANDROID) -======= -#if (!PLATFORM(MAC) && !PLATFORM(GTK)) || ENABLE(EXPERIMENTAL_SINGLE_VIEW_MODE) ->>>>>>> webkit.org at r51976:WebCore/platform/Widget.cpp +#if (!PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(ANDROID)) || ENABLE(EXPERIMENTAL_SINGLE_VIEW_MODE) void Widget::releasePlatformWidget() { } |