Linux compile fixes for webview_impl.cc

webkit/glue/webview_impl.cc

 /*
 * Copyright 2007 Google Inc. All Rights Reserved.
 *
 * Portions Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
 *
 * ***** BEGIN LICENSE BLOCK *****
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
@@ skipping 17 matching lines @@
 *
 * ***** END LICENSE BLOCK *****
 *
 */
 
 #include "config.h"
 
 #include "base/compiler_specific.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
+#if defined(OS_WIN)
 #include "Cursor.h"
+#endif
 #include "Document.h"
 #include "DocumentLoader.h"
 #include "DragController.h"
 #include "DragData.h"
 #include "Editor.h"
 #include "EventHandler.h"
 #include "FocusController.h"
 #include "FontDescription.h"
 #include "FrameLoader.h"
 #include "FrameTree.h"
 #include "FrameView.h"
 #include "GraphicsContext.h"
 #include "HitTestResult.h"
 #include "Image.h"
 #include "InspectorController.h"
 #include "IntRect.h"
 #include "KeyboardEvent.h"
 #include "MIMETypeRegistry.h"
 #include "Page.h"
-#include "Pasteboard.h"
 #include "PlatformKeyboardEvent.h"
 #include "PlatformMouseEvent.h"
 #include "PlatformWheelEvent.h"
 #include "PluginInfoStore.h"
 #if defined(OS_WIN)
 #include "RenderThemeWin.h"
 #endif
 #include "ResourceHandle.h"
 #include "SelectionController.h"
 #include "Settings.h"
@@ skipping 60 matching lines @@
   // Restrict the access to the local file system
   // (see WebView.mm WebView::_commonInitializationWithFrameName).
   FrameLoader::setLocalLoadPolicy(
       FrameLoader::AllowLocalLoadsForLocalOnly);
   return instance;
 }
 
 WebViewImpl::WebViewImpl()
     : delegate_(NULL),
       pending_history_item_(NULL),
+      observed_new_navigation_(false),
 #ifndef NDEBUG
       new_navigation_loader_(NULL),
 #endif
-      observed_new_navigation_(false),
       text_zoom_level_(0),
       context_menu_allowed_(false),
       doing_drag_and_drop_(false),
       suppress_next_keypress_event_(false),
       window_open_disposition_(IGNORE_ACTION),
       ime_accept_events_(true) {
   // WebKit/win/WebView.cpp does the same thing, except they call the
   // KJS specific wrapper around this method. We need to have threading
   // initialized because CollatorICU requires it.
   WTF::initializeThreading();
@@ skipping 90 matching lines @@
       main_frame_->frame()->view()->windowToContents(pme.pos()));
   HitTestResult result =
       main_frame_->frame()->eventHandler()->hitTestResultAtPoint(doc_point,
                                                                  false);
   Frame* target_frame;
   if (result.innerNonSharedNode())
       target_frame = result.innerNonSharedNode()->document()->frame();
   else
       target_frame = page_->focusController()->focusedOrMainFrame();
 
+#if defined(OS_WIN)
   target_frame->view()->setCursor(pointerCursor());
+#endif
 
   context_menu_allowed_ = true;
   target_frame->eventHandler()->sendContextMenuEvent(pme);
   context_menu_allowed_ = false;
   // Actually showing the context menu is handled by the ContextMenuClient
   // implementation...
 }
 
 void WebViewImpl::MouseUp(const WebMouseEvent& event) {
   if (!main_frame_->frameview())
@@ skipping 993 matching lines @@
 
 bool WebViewImpl::DragTargetDragEnter(const WebDropData& drop_data,
     int client_x, int client_y, int screen_x, int screen_y) {
   DCHECK(!current_drop_data_.get());
 
   // Copy drop_data into current_drop_data_.
   WebDropData* drop_data_copy = new WebDropData;
   *drop_data_copy = drop_data;
   current_drop_data_.reset(drop_data_copy);
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
   DragData drag_data(reinterpret_cast<DragDataRef>(current_drop_data_.get()),
       IntPoint(client_x, client_y), IntPoint(screen_x, screen_y),
       kDropTargetOperation);
 #elif defined(OS_MACOSX)
   DragData drag_data(reinterpret_cast<DragDataRef>(current_drop_data_.get()),
       IntPoint(client_x, client_y), IntPoint(screen_x, screen_y),
       kDropTargetOperation, nil);
 #endif
   DragOperation effect = page_->dragController()->dragEntered(&drag_data);
   return effect != DragOperationNone;
 }
 
 bool WebViewImpl::DragTargetDragOver(
     int client_x, int client_y, int screen_x, int screen_y) {
   DCHECK(current_drop_data_.get());
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
   DragData drag_data(reinterpret_cast<DragDataRef>(current_drop_data_.get()),
       IntPoint(client_x, client_y), IntPoint(screen_x, screen_y),
       kDropTargetOperation);
 #elif defined(OS_MACOSX)
   DragData drag_data(reinterpret_cast<DragDataRef>(current_drop_data_.get()),
       IntPoint(client_x, client_y), IntPoint(screen_x, screen_y),
       kDropTargetOperation, nil);
 #endif
   DragOperation effect = page_->dragController()->dragUpdated(&drag_data);
   return effect != DragOperationNone;
 }
 
 void WebViewImpl::DragTargetDragLeave() {
   DCHECK(current_drop_data_.get());
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
   DragData drag_data(reinterpret_cast<DragDataRef>(current_drop_data_.get()),
       IntPoint(), IntPoint(), DragOperationNone);
 #elif defined(OS_MACOSX)
   DragData drag_data(reinterpret_cast<DragDataRef>(current_drop_data_.get()),
       IntPoint(), IntPoint(), DragOperationNone, nil);
 #endif
   page_->dragController()->dragExited(&drag_data);
   current_drop_data_.reset(NULL);
 }
 
 void WebViewImpl::DragTargetDrop(
     int client_x, int client_y, int screen_x, int screen_y) {
   DCHECK(current_drop_data_.get());
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
   DragData drag_data(reinterpret_cast<DragDataRef>(current_drop_data_.get()),
       IntPoint(client_x, client_y), IntPoint(screen_x, screen_y),
       kDropTargetOperation);
 #elif defined(OS_MACOSX)
   DragData drag_data(reinterpret_cast<DragDataRef>(current_drop_data_.get()),
       IntPoint(client_x, client_y), IntPoint(screen_x, screen_y),
       kDropTargetOperation, nil);
 #endif
   page_->dragController()->performDrag(&drag_data);
   current_drop_data_.reset(NULL);
@@ skipping 212 matching lines @@
 }
 
 void WebViewImpl::DeleteImageResourceFetcher(ImageResourceFetcher* fetcher) {
   DCHECK(image_fetchers_.find(fetcher) != image_fetchers_.end());
   image_fetchers_.erase(fetcher);
 
   // We're in the callback from the ImageResourceFetcher, best to delay
   // deletion.
   MessageLoop::current()->DeleteSoon(FROM_HERE, fetcher);
 }