diff options
Diffstat (limited to 'WebCore/platform/Widget.h')
| -rw-r--r-- | WebCore/platform/Widget.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/WebCore/platform/Widget.h b/WebCore/platform/Widget.h index 677fe34..2fce858 100644 --- a/WebCore/platform/Widget.h +++ b/WebCore/platform/Widget.h @@ -239,14 +239,12 @@ private: #if PLATFORM(MAC) WidgetPrivate* m_data; #endif -<<<<<<< HEAD +#if PLATFORM(HAIKU) + PlatformWidget m_topLevelPlatformWidget; +#endif #if PLATFORM(ANDROID) public: int screenWidth() const; -======= -#if PLATFORM(HAIKU) - PlatformWidget m_topLevelPlatformWidget; ->>>>>>> webkit.org at r58033 #endif }; |