Commit d4284311 authored by aroben's avatar aroben

Reviewed by Anders.

        Change m_contextMenu to an OwnPtr.

        * WebCore.xcodeproj/project.pbxproj:
        * page/ContextMenuController.cpp:
        (WebCore::ContextMenuController::handleContextMenuEvent):
        * page/ContextMenuController.h:



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@17806 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 769ddd85
2006-11-15 Adam Roben <aroben@apple.com>
Reviewed by Anders.
Change m_contextMenu to an OwnPtr.
* WebCore.xcodeproj/project.pbxproj:
* page/ContextMenuController.cpp:
(WebCore::ContextMenuController::handleContextMenuEvent):
* page/ContextMenuController.h:
2006-11-15 Adam Roben <aroben@apple.com> 2006-11-15 Adam Roben <aroben@apple.com>
Reviewed by Anders. Reviewed by Anders.
...@@ -10627,7 +10627,6 @@ ...@@ -10627,7 +10627,6 @@
0867D690FE84028FC02AAC07 /* Project object */ = { 0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject; isa = PBXProject;
buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */; buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */;
compatibilityVersion = "Xcode 2.4";
hasScannedForEncodings = 1; hasScannedForEncodings = 1;
knownRegions = ( knownRegions = (
English, English,
...@@ -10642,7 +10641,6 @@ ...@@ -10642,7 +10641,6 @@
productRefGroup = 034768DFFF38A50411DB9C8B /* Products */; productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
projectDirPath = ""; projectDirPath = "";
projectRoot = ""; projectRoot = "";
shouldCheckCompatibility = 1;
targets = ( targets = (
93F198A508245E59001E9ABC /* WebCore */, 93F198A508245E59001E9ABC /* WebCore */,
DD041FBE09D9DDBE0010AF2A /* Derived Sources */, DD041FBE09D9DDBE0010AF2A /* Derived Sources */,
...@@ -65,7 +65,7 @@ void ContextMenuController::handleContextMenuEvent(Event* event) ...@@ -65,7 +65,7 @@ void ContextMenuController::handleContextMenuEvent(Event* event)
if (!result.innerNonSharedNode()) if (!result.innerNonSharedNode())
return; return;
m_contextMenu = new ContextMenu(result); m_contextMenu.set(new ContextMenu(result));
m_contextMenu->populate(); m_contextMenu->populate();
m_client->addCustomContextMenuItems(m_contextMenu.get()); m_client->addCustomContextMenuItems(m_contextMenu.get());
m_contextMenu->show(); m_contextMenu->show();
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <wtf/Forward.h> #include <wtf/Forward.h>
#include <wtf/Noncopyable.h> #include <wtf/Noncopyable.h>
#include <wtf/OwnPtr.h>
#include <wtf/RefPtr.h> #include <wtf/RefPtr.h>
#include "ContextMenu.h" #include "ContextMenu.h"
...@@ -53,7 +54,7 @@ namespace WebCore { ...@@ -53,7 +54,7 @@ namespace WebCore {
Page* m_page; Page* m_page;
RefPtr<ContextMenuClient> m_client; RefPtr<ContextMenuClient> m_client;
std::auto_ptr<ContextMenu> m_contextMenu; OwnPtr<ContextMenu> m_contextMenu;
}; };
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment