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 6196548..1a8f7f8 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) || ENABLE(EXPERIMENTAL_SINGLE_VIEW_MODE) +#if !PLATFORM(MAC) IntRect Widget::convertFromRootToContainingWindow(const Widget*, const IntRect& rect) { return rect; @@ -127,7 +127,11 @@ IntPoint Widget::convertFromContainingWindowToRoot(const Widget*, const IntPoint } #endif +<<<<<<< HEAD #if (!PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(ANDROID)) || ENABLE(EXPERIMENTAL_SINGLE_VIEW_MODE) +======= +#if !PLATFORM(MAC) && !PLATFORM(GTK) +>>>>>>> webkit.org at r54127 void Widget::releasePlatformWidget() { } |