diff options
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() { } |