Linux build fixes for webframe_imple.cc

webkit/glue/webframe_impl.cc

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 88 matching lines @@
 #include "FrameTree.h"
 #include "FrameView.h"
 #include "FrameWin.h"
 #include "GraphicsContext.h"
 #include "HTMLHeadElement.h"
 #include "HTMLLinkElement.h"
 #include "HTMLNames.h"
 #include "HistoryItem.h"
 #include "markup.h"
 #include "Page.h"
+#if defined(OS_WIN)
 #include "PlatformScrollBar.h"
+#endif
 #include "RenderFrame.h"
 #include "RenderWidget.h"
 #include "ReplaceSelectionCommand.h"
 #include "ResourceHandle.h"
 #if defined(OS_WIN)
 #include "ResourceHandleWin.h"
 #endif
 #include "ResourceRequest.h"
 #include "ScriptController.h"
 #include "SelectionController.h"
 #include "Settings.h"
 #include "SkiaUtils.h"
 #include "SubstituteData.h"
 #include "TextIterator.h"
 #include "TextAffinity.h"
 #include "XPathResult.h"
 
+#if defined(OS_LINUX)
+#include <gdk/gdk.h>
+#endif
+
 MSVC_POP_WARNING();
 
 #undef LOG
 #include "base/gfx/bitmap_platform_device.h"
 #include "base/gfx/platform_canvas.h"
 #include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stats_counters.h"
 #include "base/string_util.h"
@@ skipping 101 matching lines @@
       int to_append = std::min(it.length(),
                                max_chars - static_cast<int>(output->size()));
       output->append(chars, to_append);
       if (output->size() >= static_cast<size_t>(max_chars))
         return;  // Filled up the buffer.
     }
   }
 
   // Recursively walk the children.
   FrameTree* frame_tree = frame->tree();
-  Frame* cur_child = frame_tree->firstChild();
   for (Frame* cur_child = frame_tree->firstChild(); cur_child;
        cur_child = cur_child->tree()->nextSibling()) {
     // Make sure the frame separator won't fill up the buffer, and give up if
     // it will. The danger is if the separator will make the buffer longer than
     // max_chars. This will cause the computation above:
     //   max_chars - output->size()
     // to be a negative number which will crash when the subframe is added.
     if (static_cast<int>(output->size()) >= max_chars - kFrameSeparatorLen)
       return;
 
     output->append(kFrameSeparator, kFrameSeparatorLen);
     FrameContentAsPlainText(max_chars, cur_child, output);
     if (output->size() >= static_cast<size_t>(max_chars))
       return;  // Filled up the buffer.
   }
 }
 
 // WebFrameImpl ----------------------------------------------------------------
 
 int WebFrameImpl::live_object_count_ = 0;
 
 WebFrameImpl::WebFrameImpl()
 // Don't complain about using "this" in initializer list.
 MSVC_PUSH_DISABLE_WARNING(4355)
   : frame_loader_client_(this),
-    scope_matches_factory_(this),
-MSVC_POP_WARNING()
     currently_loading_request_(NULL),
     plugin_delegate_(NULL),
     allows_scrolling_(true),
     margin_width_(-1),
     margin_height_(-1),
-    last_match_count_(-1),
-    total_matchcount_(-1),
     inspected_node_(NULL),
-    active_tickmark_frame_(NULL),
     active_tickmark_(WidgetClientWin::kNoTickmark),
     locating_active_rect_(false),
     last_active_range_(NULL),
+    last_match_count_(-1),
+    total_matchcount_(-1),
+    active_tickmark_frame_(NULL),
     frames_scoping_count_(-1),
     scoping_complete_(false),
     next_invalidate_after_(0),
+    scope_matches_factory_(this),
+MSVC_POP_WARNING()
     printing_(false) {
   StatsCounter(kWebFrameActiveCount).Increment();
   live_object_count_++;
 }
 
 WebFrameImpl::~WebFrameImpl() {
   StatsCounter(kWebFrameActiveCount).Decrement();
   live_object_count_--;
 
   CancelPendingScopingEffort();
@@ skipping 416 matching lines @@
                                          std::wstring* text) const {
   text->clear();
   if (!frame_)
     return;
 
   FrameContentAsPlainText(max_chars, frame_.get(), text);
 }
 
 void WebFrameImpl::InvalidateArea(AreaToInvalidate area) {
   ASSERT(frame() && frame()->view());
-  FrameView* view = frame()->view();
 
 #if defined(OS_WIN)
+  FrameView* view = frame()->view();
   // TODO(pinkerton): Fix Mac invalidation to be more like Win ScrollView
   if ((area & INVALIDATE_ALL) == INVALIDATE_ALL) {
     view->addToDirtyRegion(view->frameGeometry());
   } else {
     if ((area & INVALIDATE_CONTENT_AREA) == INVALIDATE_CONTENT_AREA) {
       IntRect content_area(view->x(),
                            view->y(),
                            view->visibleWidth(),
                            view->visibleHeight());
       view->addToDirtyRegion(content_area);
     }
 
     if ((area & INVALIDATE_SCROLLBAR) == INVALIDATE_SCROLLBAR) {
       // Invalidate the vertical scroll bar region for the view.
       IntRect scroll_bar_vert(view->x() + view->visibleWidth(),
                               view->y(),
                               PlatformScrollbar::verticalScrollbarWidth(),
                               view->visibleHeight());
       view->addToDirtyRegion(scroll_bar_vert);
     }
   }
 #endif
 }
 
 void WebFrameImpl::InvalidateTickmark(RefPtr<WebCore::Range> tickmark) {
   ASSERT(frame() && frame()->view());
-  FrameView* view = frame()->view();
 
 #if defined(OS_WIN)
+  FrameView* view = frame()->view();
   // TODO(pinkerton): Fix Mac invalidation to be more like Win ScrollView
   IntRect pos = tickmark->boundingBox();
   pos.move(-view->contentsX(), -view->contentsY());
   view->addToDirtyRegion(pos);
 #endif
 }
 
 void WebFrameImpl::IncreaseMatchCount(int count, int request_id) {
   total_matchcount_ += count;
 
@@ skipping 716 matching lines @@
     GraphicsContext gc(reinterpret_cast<PlatformGraphicsContext*>(&context));
 #endif
     if (frame_->document() && frameview()) {
       frameview()->paint(&gc, dirty_rect);
     } else {
       gc.fillRect(dirty_rect, Color::white);
     }
   }
 }
 
-#if defined(OS_WIN)
 gfx::BitmapPlatformDevice WebFrameImpl::CaptureImage(bool scroll_to_zero) {
   // Must layout before painting.
   Layout();
-
-  gfx::PlatformCanvasWin canvas(frameview()->width(), frameview()->height(), true);
+  gfx::PlatformCanvas canvas(frameview()->width(),
+                             frameview()->height(), true);
+#if defined(OS_WIN) || defined(OS_LINUX)
   PlatformContextSkia context(&canvas);
 
   GraphicsContext gc(reinterpret_cast<PlatformGraphicsContext*>(&context));
   frameview()->paint(&gc, IntRect(0, 0, frameview()->width(),
-                                  frameview()->height()));
-
-  gfx::BitmapPlatformDeviceWin& device =
-      static_cast<gfx::BitmapPlatformDeviceWin&>(canvas.getTopPlatformDevice());
-  device.fixupAlphaBeforeCompositing();
-  return device;
-}
+                                        frameview()->height()));
 #elif defined(OS_MACOSX)
-gfx::BitmapPlatformDevice WebFrameImpl::CaptureImage(bool scroll_to_zero) {
-  // Must layout before painting.
-  Layout();
-
-  gfx::PlatformCanvasMac canvas(frameview()->width(),
-                                frameview()->height(), true);
   CGContextRef context = canvas.beginPlatformPaint();
   GraphicsContext gc(context);
   frameview()->paint(&gc, IntRect(0, 0, frameview()->width(),
                                         frameview()->height()));
   canvas.endPlatformPaint();
+#endif
 
   gfx::BitmapPlatformDevice& device =
       static_cast<gfx::BitmapPlatformDevice&>(canvas.getTopPlatformDevice());
+#if defined(OS_WIN)
+  device.fixupAlphaBeforeCompositing();
+#endif
   return device;
 }
-#else
-gfx::BitmapPlatformDevice WebFrameImpl::CaptureImage(bool scroll_to_zero) {
-  NOTIMPLEMENTED();
-}
-#endif
 
 bool WebFrameImpl::IsLoading() {
   // I'm assuming this does what we want.
   return frame_->loader()->isLoading();
 }
 
 void WebFrameImpl::Closing() {
   // let go of our references, this breaks reference cycles and will
   // usually eventually lead to us being destroyed.
   if (frameview())
@@ skipping 292 matching lines @@
 }
 
 void WebFrameImpl::GetPageRect(int page, gfx::Rect* page_size) const {
   if (page < 0 || page >= static_cast<int>(pages_.size())) {
     NOTREACHED();
     return;
   }
   *page_size = pages_[page];
 }
 
-bool WebFrameImpl::SpoolPage(int page,
-                            PlatformContextSkia* context) {
+bool WebFrameImpl::SpoolPage(int page, PlatformContextSkia* context) {
   // Ensure correct state.
   if (!context ||
       !printing_ ||
       page < 0 ||
       page >= static_cast<int>(pages_.size())) {
     NOTREACHED();
     return false;
   }
 
   if (!frame() || !frame()->document()) {
@@ skipping 22 matching lines @@
   if (loader) {
     return WebCore::FrameLoadTypeReloadAllowingStaleData ==
            loader->policyLoadType();
   }
   return false;
 }
 
 int WebFrameImpl::PendingFrameUnloadEventCount() const {
   return frame()->eventHandler()->pendingFrameUnloadEventCount();
 }