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

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

Issue 1738613002: Rename enums/functions that collide in chromium style in core/dom/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-3
Patch Set: get-names-4: Created 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 66
67 Node* hoveredNodeForPoint(LocalFrame* frame, const IntPoint& pointInRootFrame, b ool ignorePointerEventsNone) 67 Node* hoveredNodeForPoint(LocalFrame* frame, const IntPoint& pointInRootFrame, b ool ignorePointerEventsNone)
68 { 68 {
69 HitTestRequest::HitTestRequestType hitType = HitTestRequest::Move | HitTestR equest::ReadOnly | HitTestRequest::AllowChildFrameContent; 69 HitTestRequest::HitTestRequestType hitType = HitTestRequest::Move | HitTestR equest::ReadOnly | HitTestRequest::AllowChildFrameContent;
70 if (ignorePointerEventsNone) 70 if (ignorePointerEventsNone)
71 hitType |= HitTestRequest::IgnorePointerEventsNone; 71 hitType |= HitTestRequest::IgnorePointerEventsNone;
72 HitTestRequest request(hitType); 72 HitTestRequest request(hitType);
73 HitTestResult result(request, frame->view()->rootFrameToContents(pointInRoot Frame)); 73 HitTestResult result(request, frame->view()->rootFrameToContents(pointInRoot Frame));
74 frame->contentLayoutObject()->hitTest(result); 74 frame->contentLayoutObject()->hitTest(result);
75 Node* node = result.innerPossiblyPseudoNode(); 75 Node* node = result.innerPossiblyPseudoNode();
76 while (node && node->nodeType() == Node::TEXT_NODE) 76 while (node && node->getNodeType() == Node::TEXT_NODE)
77 node = node->parentNode(); 77 node = node->parentNode();
78 return node; 78 return node;
79 } 79 }
80 80
81 Node* hoveredNodeForEvent(LocalFrame* frame, const PlatformGestureEvent& event, bool ignorePointerEventsNone) 81 Node* hoveredNodeForEvent(LocalFrame* frame, const PlatformGestureEvent& event, bool ignorePointerEventsNone)
82 { 82 {
83 return hoveredNodeForPoint(frame, event.position(), ignorePointerEventsNone) ; 83 return hoveredNodeForPoint(frame, event.position(), ignorePointerEventsNone) ;
84 } 84 }
85 85
86 Node* hoveredNodeForEvent(LocalFrame* frame, const PlatformMouseEvent& event, bo ol ignorePointerEventsNone) 86 Node* hoveredNodeForEvent(LocalFrame* frame, const PlatformMouseEvent& event, bo ol ignorePointerEventsNone)
(...skipping 660 matching lines...) Expand 10 before | Expand all | Expand 10 after
747 747
748 void InspectorOverlay::initializeLayoutEditorIfNeeded(Node* node) 748 void InspectorOverlay::initializeLayoutEditorIfNeeded(Node* node)
749 { 749 {
750 if (m_inspectMode != InspectorDOMAgent::ShowLayoutEditor || !node || !node-> isElementNode() || !node->ownerDocument()->isActive()) 750 if (m_inspectMode != InspectorDOMAgent::ShowLayoutEditor || !node || !node-> isElementNode() || !node->ownerDocument()->isActive())
751 return; 751 return;
752 m_layoutEditor = LayoutEditor::create(toElement(node), m_cssAgent, m_domAgen t, &overlayMainFrame()->script()); 752 m_layoutEditor = LayoutEditor::create(toElement(node), m_cssAgent, m_domAgen t, &overlayMainFrame()->script());
753 toChromeClientImpl(m_webViewImpl->page()->chromeClient()).setCursorOverridde n(true); 753 toChromeClientImpl(m_webViewImpl->page()->chromeClient()).setCursorOverridde n(true);
754 } 754 }
755 755
756 } // namespace blink 756 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698