diff options
Diffstat (limited to 'WebCore/platform/Widget.cpp')
| -rw-r--r-- | WebCore/platform/Widget.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/WebCore/platform/Widget.cpp b/WebCore/platform/Widget.cpp index 05a5237..77560ff 100644 --- a/WebCore/platform/Widget.cpp +++ b/WebCore/platform/Widget.cpp @@ -127,19 +127,6 @@ IntPoint Widget::convertFromContainingWindowToRoot(const Widget*, const IntPoint } #endif -<<<<<<< HEAD -#if !PLATFORM(MAC) && !PLATFORM(GTK) && !OS(ANDROID) -void Widget::releasePlatformWidget() -{ -} - -void Widget::retainPlatformWidget() -{ -} -#endif - -======= ->>>>>>> webkit.org at r68651 IntRect Widget::convertToContainingView(const IntRect& localRect) const { if (const ScrollView* parentScrollView = parent()) { |