POSIX: gfx::NativeViewId and CrossProcessEvent

webkit/glue/chromium_bridge_impl.cc

 // Copyright (c) 2008 The Chromium Authors. All rights reserved.  Use of this
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
 #include "config.h"
 #include "ChromiumBridge.h"
 
 #include "BitmapImage.h"
 #include "ClipboardUtilitiesChromium.h"
 #include "Cursor.h"
@@ skipping 44 matching lines @@
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <vssym32.h>
 
 #include "base/gfx/native_theme.h"
 #endif
 
 namespace {
 
-gfx::NativeView ToPlatform(WebCore::Widget* widget) {
+gfx::NativeViewId ToNativeId(WebCore::Widget* widget) {
   if (!widget)
     return 0;
-  PlatformWidget widget_id = widget->root()->hostWindow()->platformWindow();
-  // TODO(eseidel): This cast is a hack.  We should replace gfx::NativeView with
-  // something more abstract like PlatformWidget since webkit/glue should not
-  // know about actual native widgets.
-  return static_cast<gfx::NativeView>(widget_id);
+  return widget->root()->hostWindow()->platformWindow();
 }
 
 #if PLATFORM(WIN_OS)
 static RECT IntRectToRECT(const WebCore::IntRect& r) {
   RECT result;
   result.left = r.x();
   result.top = r.y();
   result.right = r.right();
   result.bottom = r.bottom();
   return result;
@@ skipping 343 matching lines @@
       SharedBuffer::create(data.empty() ? "" : data.data(),
                            data.length()));
   RefPtr<Image> image = BitmapImage::create();
   image->setData(buffer, true);
   return image;
 }
 
 // Screen ---------------------------------------------------------------------
 
 int ChromiumBridge::screenDepth(Widget* widget) {
-  return webkit_glue::GetScreenInfo(ToPlatform(widget)).depth;
+  return webkit_glue::GetScreenInfo(ToNativeId(widget)).depth;
 }
 
 int ChromiumBridge::screenDepthPerComponent(Widget* widget) {
-  return webkit_glue::GetScreenInfo(ToPlatform(widget)).depth_per_component;
+  return webkit_glue::GetScreenInfo(ToNativeId(widget)).depth_per_component;
 }
 
 bool ChromiumBridge::screenIsMonochrome(Widget* widget) {
-  return webkit_glue::GetScreenInfo(ToPlatform(widget)).is_monochrome;
+  return webkit_glue::GetScreenInfo(ToNativeId(widget)).is_monochrome;
 }
 
 IntRect ChromiumBridge::screenRect(Widget* widget) {
   return webkit_glue::ToIntRect(
-      webkit_glue::GetScreenInfo(ToPlatform(widget)).rect);
+      webkit_glue::GetScreenInfo(ToNativeId(widget)).rect);
 }
 
 IntRect ChromiumBridge::screenAvailableRect(Widget* widget) {
   return webkit_glue::ToIntRect(
-      webkit_glue::GetScreenInfo(ToPlatform(widget)).available_rect);
+      webkit_glue::GetScreenInfo(ToNativeId(widget)).available_rect);
 }
 
 // SharedTimers ----------------------------------------------------------------
 // Called by SharedTimerChromium.cpp
 
 class SharedTimerTask;
 
 // We maintain a single active timer and a single active task for
 // setting timers directly on the platform.
 static SharedTimerTask* shared_timer_task;
@@ skipping 242 matching lines @@
     chrome_client->SetCursor(WebCursor(cursor.impl()));
 }
 
 void ChromiumBridge::widgetSetFocus(Widget* widget) {
   ChromeClientImpl* chrome_client = ToChromeClient(widget);
   if (chrome_client)
     chrome_client->focus();
 }
 
 }  // namespace WebCore