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

Side by Side Diff: Source/core/frame/LocalDOMWindow.cpp

Issue 404473004: Rename DOMPoint to WebKitPoint in C++ sides. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase Created 6 years, 5 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 | « Source/core/frame/LocalDOMWindow.h ('k') | Source/core/frame/WebKitPoint.h » ('j') | 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) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 #include "core/dom/RequestAnimationFrameCallback.h" 52 #include "core/dom/RequestAnimationFrameCallback.h"
53 #include "core/editing/Editor.h" 53 #include "core/editing/Editor.h"
54 #include "core/events/DOMWindowEventQueue.h" 54 #include "core/events/DOMWindowEventQueue.h"
55 #include "core/events/EventListener.h" 55 #include "core/events/EventListener.h"
56 #include "core/events/HashChangeEvent.h" 56 #include "core/events/HashChangeEvent.h"
57 #include "core/events/MessageEvent.h" 57 #include "core/events/MessageEvent.h"
58 #include "core/events/PageTransitionEvent.h" 58 #include "core/events/PageTransitionEvent.h"
59 #include "core/events/PopStateEvent.h" 59 #include "core/events/PopStateEvent.h"
60 #include "core/frame/BarProp.h" 60 #include "core/frame/BarProp.h"
61 #include "core/frame/Console.h" 61 #include "core/frame/Console.h"
62 #include "core/frame/DOMPoint.h"
63 #include "core/frame/DOMWindowLifecycleNotifier.h" 62 #include "core/frame/DOMWindowLifecycleNotifier.h"
64 #include "core/frame/EventHandlerRegistry.h" 63 #include "core/frame/EventHandlerRegistry.h"
65 #include "core/frame/FrameConsole.h" 64 #include "core/frame/FrameConsole.h"
66 #include "core/frame/FrameHost.h" 65 #include "core/frame/FrameHost.h"
67 #include "core/frame/FrameView.h" 66 #include "core/frame/FrameView.h"
68 #include "core/frame/History.h" 67 #include "core/frame/History.h"
69 #include "core/frame/LocalFrame.h" 68 #include "core/frame/LocalFrame.h"
70 #include "core/frame/Location.h" 69 #include "core/frame/Location.h"
71 #include "core/frame/Navigator.h" 70 #include "core/frame/Navigator.h"
72 #include "core/frame/Screen.h" 71 #include "core/frame/Screen.h"
73 #include "core/frame/Settings.h" 72 #include "core/frame/Settings.h"
73 #include "core/frame/WebKitPoint.h"
74 #include "core/html/HTMLFrameOwnerElement.h" 74 #include "core/html/HTMLFrameOwnerElement.h"
75 #include "core/inspector/InspectorInstrumentation.h" 75 #include "core/inspector/InspectorInstrumentation.h"
76 #include "core/inspector/InspectorTraceEvents.h" 76 #include "core/inspector/InspectorTraceEvents.h"
77 #include "core/inspector/ScriptCallStack.h" 77 #include "core/inspector/ScriptCallStack.h"
78 #include "core/loader/DocumentLoader.h" 78 #include "core/loader/DocumentLoader.h"
79 #include "core/loader/FrameLoadRequest.h" 79 #include "core/loader/FrameLoadRequest.h"
80 #include "core/loader/FrameLoader.h" 80 #include "core/loader/FrameLoader.h"
81 #include "core/loader/FrameLoaderClient.h" 81 #include "core/loader/FrameLoaderClient.h"
82 #include "core/loader/MixedContentChecker.h" 82 #include "core/loader/MixedContentChecker.h"
83 #include "core/loader/SinkDocument.h" 83 #include "core/loader/SinkDocument.h"
(...skipping 1240 matching lines...) Expand 10 before | Expand all | Expand 10 after
1324 unsigned colonStart = pseudoElement[0] == ':' ? (pseudoElement[1] == ':' ? 2 : 1) : 0; 1324 unsigned colonStart = pseudoElement[0] == ':' ? (pseudoElement[1] == ':' ? 2 : 1) : 0;
1325 CSSSelector::PseudoType pseudoType = CSSSelector::parsePseudoType(AtomicStri ng(pseudoElement.substring(colonStart))); 1325 CSSSelector::PseudoType pseudoType = CSSSelector::parsePseudoType(AtomicStri ng(pseudoElement.substring(colonStart)));
1326 if (pseudoType == CSSSelector::PseudoUnknown && !pseudoElement.isEmpty()) 1326 if (pseudoType == CSSSelector::PseudoUnknown && !pseudoElement.isEmpty())
1327 return nullptr; 1327 return nullptr;
1328 1328
1329 unsigned rulesToInclude = StyleResolver::AuthorCSSRules; 1329 unsigned rulesToInclude = StyleResolver::AuthorCSSRules;
1330 PseudoId pseudoId = CSSSelector::pseudoId(pseudoType); 1330 PseudoId pseudoId = CSSSelector::pseudoId(pseudoType);
1331 return m_frame->document()->ensureStyleResolver().pseudoCSSRulesForElement(e lement, pseudoId, rulesToInclude); 1331 return m_frame->document()->ensureStyleResolver().pseudoCSSRulesForElement(e lement, pseudoId, rulesToInclude);
1332 } 1332 }
1333 1333
1334 PassRefPtrWillBeRawPtr<DOMPoint> LocalDOMWindow::webkitConvertPointFromNodeToPag e(Node* node, const DOMPoint* p) const 1334 PassRefPtrWillBeRawPtr<WebKitPoint> LocalDOMWindow::webkitConvertPointFromNodeTo Page(Node* node, const WebKitPoint* p) const
1335 { 1335 {
1336 if (!node || !p) 1336 if (!node || !p)
1337 return nullptr; 1337 return nullptr;
1338 1338
1339 if (!document()) 1339 if (!document())
1340 return nullptr; 1340 return nullptr;
1341 1341
1342 document()->updateLayoutIgnorePendingStylesheets(); 1342 document()->updateLayoutIgnorePendingStylesheets();
1343 1343
1344 FloatPoint pagePoint(p->x(), p->y()); 1344 FloatPoint pagePoint(p->x(), p->y());
1345 pagePoint = node->convertToPage(pagePoint); 1345 pagePoint = node->convertToPage(pagePoint);
1346 return DOMPoint::create(pagePoint.x(), pagePoint.y()); 1346 return WebKitPoint::create(pagePoint.x(), pagePoint.y());
1347 } 1347 }
1348 1348
1349 PassRefPtrWillBeRawPtr<DOMPoint> LocalDOMWindow::webkitConvertPointFromPageToNod e(Node* node, const DOMPoint* p) const 1349 PassRefPtrWillBeRawPtr<WebKitPoint> LocalDOMWindow::webkitConvertPointFromPageTo Node(Node* node, const WebKitPoint* p) const
1350 { 1350 {
1351 if (!node || !p) 1351 if (!node || !p)
1352 return nullptr; 1352 return nullptr;
1353 1353
1354 if (!document()) 1354 if (!document())
1355 return nullptr; 1355 return nullptr;
1356 1356
1357 document()->updateLayoutIgnorePendingStylesheets(); 1357 document()->updateLayoutIgnorePendingStylesheets();
1358 1358
1359 FloatPoint nodePoint(p->x(), p->y()); 1359 FloatPoint nodePoint(p->x(), p->y());
1360 nodePoint = node->convertFromPage(nodePoint); 1360 nodePoint = node->convertFromPage(nodePoint);
1361 return DOMPoint::create(nodePoint.x(), nodePoint.y()); 1361 return WebKitPoint::create(nodePoint.x(), nodePoint.y());
1362 } 1362 }
1363 1363
1364 double LocalDOMWindow::devicePixelRatio() const 1364 double LocalDOMWindow::devicePixelRatio() const
1365 { 1365 {
1366 if (!m_frame) 1366 if (!m_frame)
1367 return 0.0; 1367 return 0.0;
1368 1368
1369 return m_frame->devicePixelRatio(); 1369 return m_frame->devicePixelRatio();
1370 } 1370 }
1371 1371
(...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after
1942 visitor->trace(m_localStorage); 1942 visitor->trace(m_localStorage);
1943 visitor->trace(m_applicationCache); 1943 visitor->trace(m_applicationCache);
1944 visitor->trace(m_performance); 1944 visitor->trace(m_performance);
1945 visitor->trace(m_css); 1945 visitor->trace(m_css);
1946 visitor->trace(m_eventQueue); 1946 visitor->trace(m_eventQueue);
1947 WillBeHeapSupplementable<LocalDOMWindow>::trace(visitor); 1947 WillBeHeapSupplementable<LocalDOMWindow>::trace(visitor);
1948 EventTargetWithInlineData::trace(visitor); 1948 EventTargetWithInlineData::trace(visitor);
1949 } 1949 }
1950 1950
1951 } // namespace blink 1951 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/LocalDOMWindow.h ('k') | Source/core/frame/WebKitPoint.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698