diff options
| -rw-r--r-- | webkit/SConscript.port | 3 | ||||
| -rw-r--r-- | webkit/port/platform/chromium/ContextMenuItemChromium.cpp | 2 | ||||
| -rw-r--r-- | webkit/port/platform/network/chromium/NetworkStateNotifierChromium.cpp | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/webkit/SConscript.port b/webkit/SConscript.port index eed7c8f..5e79476 100644 --- a/webkit/SConscript.port +++ b/webkit/SConscript.port @@ -118,11 +118,8 @@ if env['PLATFORM'] in ('posix', 'darwin'): # Remove from the list files that haven't yet been made portable # to Mac and Linux. remove_files = [ - '$PORT_DIR/platform/network/chromium/NetworkStateNotifierChromium.cpp', '$PORT_DIR/page/chromium/AXObjectCacheChromium.cpp', - '$PORT_DIR/page/chromium/DragControllerChromium.cpp', '$PORT_DIR/page/chromium/EventHandlerChromium.cpp', - '$PORT_DIR/platform/chromium/ContextMenuItemChromium.cpp', '$PORT_DIR/platform/chromium/CursorChromium.cpp', '$PORT_DIR/platform/chromium/DragDataChromium.cpp', '$PORT_DIR/platform/chromium/PlatformScrollBarChromium.cpp', diff --git a/webkit/port/platform/chromium/ContextMenuItemChromium.cpp b/webkit/port/platform/chromium/ContextMenuItemChromium.cpp index 1aab658..ebdc9c9 100644 --- a/webkit/port/platform/chromium/ContextMenuItemChromium.cpp +++ b/webkit/port/platform/chromium/ContextMenuItemChromium.cpp @@ -51,7 +51,7 @@ ContextMenuItem::~ContextMenuItem() PlatformMenuItemDescription ContextMenuItem::releasePlatformDescription() { - return 0; + return PlatformMenuItemDescription(); } ContextMenuItemType ContextMenuItem::type() const diff --git a/webkit/port/platform/network/chromium/NetworkStateNotifierChromium.cpp b/webkit/port/platform/network/chromium/NetworkStateNotifierChromium.cpp index b7e8f08..a4475c3 100644 --- a/webkit/port/platform/network/chromium/NetworkStateNotifierChromium.cpp +++ b/webkit/port/platform/network/chromium/NetworkStateNotifierChromium.cpp @@ -43,6 +43,7 @@ void NetworkStateNotifier::networkStateChangeTimerFired(Timer<NetworkStateNotifi }
#endif
+#if PLATFORM(WIN) || PLATFORM(MAC)
NetworkStateNotifier::NetworkStateNotifier()
: m_isOnLine(true)
#if PLATFORM(MAC)
@@ -50,5 +51,6 @@ NetworkStateNotifier::NetworkStateNotifier() #endif
{
}
+#endif
}
|