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

Side by Side Diff: third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp

Issue 2763583002: Remove setting the pointer cursor when the context menu event is sent. (Closed)
Patch Set: Created 3 years, 9 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2014 Google Inc. All rights reserved. 2 * Copyright (C) 2014 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 781 matching lines...) Expand 10 before | Expand all | Expand 10 after
792 792
793 // This will need to be changed to a nullptr check when focus control 793 // This will need to be changed to a nullptr check when focus control
794 // is refactored, at which point focusedOrMainFrame will never return a 794 // is refactored, at which point focusedOrMainFrame will never return a
795 // RemoteFrame. 795 // RemoteFrame.
796 // See https://crbug.com/341918. 796 // See https://crbug.com/341918.
797 if (!targetFrame->isLocalFrame()) 797 if (!targetFrame->isLocalFrame())
798 return; 798 return;
799 799
800 LocalFrame* targetLocalFrame = toLocalFrame(targetFrame); 800 LocalFrame* targetLocalFrame = toLocalFrame(targetFrame);
801 801
802 #if OS(WIN)
803 targetLocalFrame->view()->setCursor(pointerCursor());
804 #endif
805
806 { 802 {
807 ContextMenuAllowedScope scope; 803 ContextMenuAllowedScope scope;
808 targetLocalFrame->eventHandler().sendContextMenuEvent(transformedEvent, 804 targetLocalFrame->eventHandler().sendContextMenuEvent(transformedEvent,
809 nullptr); 805 nullptr);
810 } 806 }
811 // Actually showing the context menu is handled by the ContextMenuClient 807 // Actually showing the context menu is handled by the ContextMenuClient
812 // implementation... 808 // implementation...
813 } 809 }
814 810
815 void WebFrameWidgetImpl::handleMouseUp(LocalFrame& mainFrame, 811 void WebFrameWidgetImpl::handleMouseUp(LocalFrame& mainFrame,
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
1142 return nullptr; 1138 return nullptr;
1143 } 1139 }
1144 1140
1145 LocalFrame* WebFrameWidgetImpl::focusedLocalFrameAvailableForIme() const { 1141 LocalFrame* WebFrameWidgetImpl::focusedLocalFrameAvailableForIme() const {
1146 if (!m_imeAcceptEvents) 1142 if (!m_imeAcceptEvents)
1147 return nullptr; 1143 return nullptr;
1148 return focusedLocalFrameInWidget(); 1144 return focusedLocalFrameInWidget();
1149 } 1145 }
1150 1146
1151 } // namespace blink 1147 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698