Changeset 47206 in webkit

Timestamp:

Aug 13, 2009 10:08:19 AM (15 years ago)

Author:

eric@webkit.org

Message:

2009-08-13 Maxime Simon <Maxime Simon>

Reviewed by Eric Seidel.

[Haiku] Remove the "m_point" code from ContextMenuHaiku.cpp
​https://bugs.webkit.org/show_bug.cgi?id=28256

• platform/haiku/ContextMenuHaiku.cpp: (WebCore::ContextMenuReceiver::ContextMenuReceiver): (WebCore::ContextMenu::ContextMenu): (WebCore::ContextMenu::appendItem): (WebCore::ContextMenu::insertItem):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/haiku/ContextMenuHaiku.cpp (modified) (5 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-08-13  Maxime Simon  <simon.maxime@gmail.com>
+
+        Reviewed by Eric Seidel.
+
+        [Haiku] Remove the "m_point" code from ContextMenuHaiku.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=28256
+
+        * platform/haiku/ContextMenuHaiku.cpp:
+        (WebCore::ContextMenuReceiver::ContextMenuReceiver):
+        (WebCore::ContextMenu::ContextMenu):
+        (WebCore::ContextMenu::appendItem):
+        (WebCore::ContextMenu::insertItem):
+
 2009-08-13  Joseph Pecoraro  <joepeck02@gmail.com>
 

trunk/WebCore/platform/haiku/ContextMenuHaiku.cpp

@@ -28 +28 @@
 #include "ContextMenu.h"
 
+#include "ContextMenuController.h"
 #include "ContextMenuItem.h"
-#include "ContextMenuController.h"
+#include "Document.h"
 #include "Frame.h"
 #include "FrameView.h"
-#include "Document.h"
-
-#include <wtf/Assertions.h>
-
 #include <Looper.h>
 #include <Menu.h>
 #include <Message.h>
+#include <wtf/Assertions.h>
 
 
@@ -44 +42 @@
 
 // FIXME: This class isn't used yet
-class ContextMenuReceiver : public BLooper
-{
+class ContextMenuReceiver : public BLooper {
 public:
     ContextMenuReceiver(ContextMenu* menu)
         : BLooper("context_menu_receiver")
         , m_menu(menu)
+        , m_result(-1)
     {
-        m_result = -1;
     }
 
@@ -81 +78 @@
 ContextMenu::ContextMenu(const HitTestResult& result)
     : m_hitTestResult(result)
-    , m_platformDescription(NULL)
+    , m_platformDescription(new BMenu("context_menu"))
 {
-    /* Get position */
-    if (result.innerNode() && result.innerNode()->document()) {
-        BView* view = result.innerNode()->document()->frame()->view()->platformWidget();
-        int child = 0;
-        while (view->ChildAt(child)) {
-            if (view->ChildAt(child)->Name() == "scroll_view_canvas") {
-                m_point = view->ChildAt(child)->ConvertToScreen(BPoint(result.point().x(), result.point().y()));
-                break;
-            }
-            child++;
-        }
-    }
-    m_platformDescription = new BMenu("context_menu");
 }
 
@@ -107 +91 @@
     checkOrEnableIfNeeded(item);
 
-    BMenuItem* bItem = item.releasePlatformDescription();
-    if (bItem)
-        m_platformDescription->AddItem(bItem);
+    BMenuItem* menuItem = item.releasePlatformDescription();
+    if (menuItem)
+        m_platformDescription->AddItem(menuItem);
 }
 
@@ -121 +105 @@
     checkOrEnableIfNeeded(item);
 
-    BMenuItem* bItem = item.releasePlatformDescription();
-    if (bItem)
-        m_platformDescription->AddItem(bItem, position);
+    BMenuItem* menuItem = item.releasePlatformDescription();
+    if (menuItem)
+        m_platformDescription->AddItem(menuItem, position);
 }