Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(184)

Unified Diff: third_party/WebKit/Source/core/page/ContextMenuController.cpp

Issue 2905763003: Rollback ContextMenu (Closed)
Patch Set: Rebase Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/page/ContextMenuController.cpp
diff --git a/third_party/WebKit/Source/core/page/ContextMenuController.cpp b/third_party/WebKit/Source/core/page/ContextMenuController.cpp
index 4372fbbf37747f56d40d489bc83740baf80889b7..a5f627ef5c9012fa6f610ab30d0fbea81d1fc565 100644
--- a/third_party/WebKit/Source/core/page/ContextMenuController.cpp
+++ b/third_party/WebKit/Source/core/page/ContextMenuController.cpp
@@ -31,21 +31,16 @@
#include "core/dom/Node.h"
#include "core/events/Event.h"
#include "core/events/MouseEvent.h"
-#include "core/events/RelatedEvent.h"
#include "core/frame/LocalFrame.h"
-#include "core/html/HTMLMenuElement.h"
#include "core/input/EventHandler.h"
#include "core/page/ContextMenuClient.h"
#include "core/page/ContextMenuProvider.h"
-#include "core/page/CustomContextMenuProvider.h"
#include "platform/ContextMenu.h"
#include "platform/ContextMenuItem.h"
#include "platform/wtf/PtrUtil.h"
namespace blink {
-using namespace HTMLNames;
-
ContextMenuController::ContextMenuController(Page*, ContextMenuClient* client)
: client_(client) {
DCHECK(client);
@@ -81,35 +76,10 @@ void ContextMenuController::DocumentDetached(Document* document) {
}
}
-void ContextMenuController::PopulateCustomContextMenu(const Event& event) {
- if (!RuntimeEnabledFeatures::contextMenuEnabled())
- return;
-
- Node* node = event.target()->ToNode();
- if (!node || !node->IsHTMLElement())
- return;
-
- HTMLElement& element = ToHTMLElement(*node);
- HTMLMenuElement* menu_element = element.AssignedContextMenu();
- if (!menu_element || !DeprecatedEqualIgnoringCase(
- menu_element->FastGetAttribute(typeAttr), "context"))
- return;
- RelatedEvent* related_event =
- RelatedEvent::Create(EventTypeNames::show, true, true, node);
- if (menu_element->DispatchEvent(related_event) !=
- DispatchEventResult::kNotCanceled)
- return;
- if (menu_element != element.AssignedContextMenu())
- return;
- menu_provider_ = CustomContextMenuProvider::Create(*menu_element, element);
- menu_provider_->PopulateContextMenu(context_menu_.get());
-}
-
void ContextMenuController::HandleContextMenuEvent(Event* event) {
context_menu_ = CreateContextMenu(event);
if (!context_menu_)
return;
- PopulateCustomContextMenu(*event);
ShowContextMenu(event);
}

Powered by Google App Engine
This is Rietveld 408576698