diff options
Diffstat (limited to 'WebCore/platform/Widget.cpp')
| -rw-r--r-- | WebCore/platform/Widget.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/WebCore/platform/Widget.cpp b/WebCore/platform/Widget.cpp index 23e5de8..2213a11 100644 --- a/WebCore/platform/Widget.cpp +++ b/WebCore/platform/Widget.cpp @@ -105,7 +105,7 @@ IntPoint Widget::convertToContainingWindow(const IntPoint& localPoint) const return convertFromRootToContainingWindow(this, localPoint); } -#if !PLATFORM(MAC) +#if !PLATFORM(MAC) || ENABLE(EXPERIMENTAL_SINGLE_VIEW_MODE) IntRect Widget::convertFromRootToContainingWindow(const Widget*, const IntRect& rect) { return rect; @@ -127,7 +127,11 @@ 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 void Widget::releasePlatformWidget() { } |