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

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

Issue 2755783002: 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) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 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 556 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 Frame* targetFrame; 567 Frame* targetFrame;
568 if (result.innerNodeOrImageMapImage()) 568 if (result.innerNodeOrImageMapImage())
569 targetFrame = result.innerNodeOrImageMapImage()->document().frame(); 569 targetFrame = result.innerNodeOrImageMapImage()->document().frame();
570 else 570 else
571 targetFrame = m_page->focusController().focusedOrMainFrame(); 571 targetFrame = m_page->focusController().focusedOrMainFrame();
572 572
573 if (!targetFrame->isLocalFrame()) 573 if (!targetFrame->isLocalFrame())
574 return; 574 return;
575 575
576 LocalFrame* targetLocalFrame = toLocalFrame(targetFrame); 576 LocalFrame* targetLocalFrame = toLocalFrame(targetFrame);
577
578 #if OS(WIN)
579 targetLocalFrame->view()->setCursor(pointerCursor());
580 #endif
581
582 { 577 {
583 ContextMenuAllowedScope scope; 578 ContextMenuAllowedScope scope;
584 targetLocalFrame->eventHandler().sendContextMenuEvent(transformedEvent, 579 targetLocalFrame->eventHandler().sendContextMenuEvent(transformedEvent,
585 nullptr); 580 nullptr);
586 } 581 }
587 // Actually showing the context menu is handled by the ContextMenuClient 582 // Actually showing the context menu is handled by the ContextMenuClient
588 // implementation... 583 // implementation...
589 } 584 }
590 585
591 void WebViewImpl::handleMouseUp(LocalFrame& mainFrame, 586 void WebViewImpl::handleMouseUp(LocalFrame& mainFrame,
(...skipping 3587 matching lines...) Expand 10 before | Expand all | Expand 10 after
4179 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame()) 4174 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame())
4180 return nullptr; 4175 return nullptr;
4181 return focusedFrame; 4176 return focusedFrame;
4182 } 4177 }
4183 4178
4184 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const { 4179 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const {
4185 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr; 4180 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
4186 } 4181 }
4187 4182
4188 } // namespace blink 4183 } // 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