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

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

Issue 428533003: Remove webkitConvertPointFromPageToNode() and webkitConvertPointFromNodeToPage() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/frame/LocalDOMWindow.h ('k') | Source/core/frame/Window.idl » ('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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 #include "core/frame/EventHandlerRegistry.h" 63 #include "core/frame/EventHandlerRegistry.h"
64 #include "core/frame/FrameConsole.h" 64 #include "core/frame/FrameConsole.h"
65 #include "core/frame/FrameHost.h" 65 #include "core/frame/FrameHost.h"
66 #include "core/frame/FrameView.h" 66 #include "core/frame/FrameView.h"
67 #include "core/frame/History.h" 67 #include "core/frame/History.h"
68 #include "core/frame/LocalFrame.h" 68 #include "core/frame/LocalFrame.h"
69 #include "core/frame/Location.h" 69 #include "core/frame/Location.h"
70 #include "core/frame/Navigator.h" 70 #include "core/frame/Navigator.h"
71 #include "core/frame/Screen.h" 71 #include "core/frame/Screen.h"
72 #include "core/frame/Settings.h" 72 #include "core/frame/Settings.h"
73 #include "core/frame/WebKitPoint.h"
74 #include "core/html/HTMLFrameOwnerElement.h" 73 #include "core/html/HTMLFrameOwnerElement.h"
75 #include "core/inspector/InspectorInstrumentation.h" 74 #include "core/inspector/InspectorInstrumentation.h"
76 #include "core/inspector/InspectorTraceEvents.h" 75 #include "core/inspector/InspectorTraceEvents.h"
77 #include "core/inspector/ScriptCallStack.h" 76 #include "core/inspector/ScriptCallStack.h"
78 #include "core/loader/DocumentLoader.h" 77 #include "core/loader/DocumentLoader.h"
79 #include "core/loader/FrameLoadRequest.h" 78 #include "core/loader/FrameLoadRequest.h"
80 #include "core/loader/FrameLoader.h" 79 #include "core/loader/FrameLoader.h"
81 #include "core/loader/FrameLoaderClient.h" 80 #include "core/loader/FrameLoaderClient.h"
82 #include "core/loader/MixedContentChecker.h" 81 #include "core/loader/MixedContentChecker.h"
83 #include "core/loader/SinkDocument.h" 82 #include "core/loader/SinkDocument.h"
(...skipping 1251 matching lines...) Expand 10 before | Expand all | Expand 10 after
1335 unsigned colonStart = pseudoElement[0] == ':' ? (pseudoElement[1] == ':' ? 2 : 1) : 0; 1334 unsigned colonStart = pseudoElement[0] == ':' ? (pseudoElement[1] == ':' ? 2 : 1) : 0;
1336 CSSSelector::PseudoType pseudoType = CSSSelector::parsePseudoType(AtomicStri ng(pseudoElement.substring(colonStart))); 1335 CSSSelector::PseudoType pseudoType = CSSSelector::parsePseudoType(AtomicStri ng(pseudoElement.substring(colonStart)));
1337 if (pseudoType == CSSSelector::PseudoUnknown && !pseudoElement.isEmpty()) 1336 if (pseudoType == CSSSelector::PseudoUnknown && !pseudoElement.isEmpty())
1338 return nullptr; 1337 return nullptr;
1339 1338
1340 unsigned rulesToInclude = StyleResolver::AuthorCSSRules; 1339 unsigned rulesToInclude = StyleResolver::AuthorCSSRules;
1341 PseudoId pseudoId = CSSSelector::pseudoId(pseudoType); 1340 PseudoId pseudoId = CSSSelector::pseudoId(pseudoType);
1342 return m_frame->document()->ensureStyleResolver().pseudoCSSRulesForElement(e lement, pseudoId, rulesToInclude); 1341 return m_frame->document()->ensureStyleResolver().pseudoCSSRulesForElement(e lement, pseudoId, rulesToInclude);
1343 } 1342 }
1344 1343
1345 PassRefPtrWillBeRawPtr<WebKitPoint> LocalDOMWindow::webkitConvertPointFromNodeTo Page(Node* node, const WebKitPoint* p) const
1346 {
1347 if (!node || !p)
1348 return nullptr;
1349
1350 if (!document())
1351 return nullptr;
1352
1353 document()->updateLayoutIgnorePendingStylesheets();
1354
1355 FloatPoint pagePoint(p->x(), p->y());
1356 pagePoint = node->convertToPage(pagePoint);
1357 return WebKitPoint::create(pagePoint.x(), pagePoint.y());
1358 }
1359
1360 PassRefPtrWillBeRawPtr<WebKitPoint> LocalDOMWindow::webkitConvertPointFromPageTo Node(Node* node, const WebKitPoint* p) const
1361 {
1362 if (!node || !p)
1363 return nullptr;
1364
1365 if (!document())
1366 return nullptr;
1367
1368 document()->updateLayoutIgnorePendingStylesheets();
1369
1370 FloatPoint nodePoint(p->x(), p->y());
1371 nodePoint = node->convertFromPage(nodePoint);
1372 return WebKitPoint::create(nodePoint.x(), nodePoint.y());
1373 }
1374
1375 double LocalDOMWindow::devicePixelRatio() const 1344 double LocalDOMWindow::devicePixelRatio() const
1376 { 1345 {
1377 if (!m_frame) 1346 if (!m_frame)
1378 return 0.0; 1347 return 0.0;
1379 1348
1380 return m_frame->devicePixelRatio(); 1349 return m_frame->devicePixelRatio();
1381 } 1350 }
1382 1351
1383 static bool scrollBehaviorFromScrollOptions(const Dictionary& scrollOptions, Scr ollBehavior& scrollBehavior, ExceptionState& exceptionState) 1352 static bool scrollBehaviorFromScrollOptions(const Dictionary& scrollOptions, Scr ollBehavior& scrollBehavior, ExceptionState& exceptionState)
1384 { 1353 {
(...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after
1954 visitor->trace(m_localStorage); 1923 visitor->trace(m_localStorage);
1955 visitor->trace(m_applicationCache); 1924 visitor->trace(m_applicationCache);
1956 visitor->trace(m_performance); 1925 visitor->trace(m_performance);
1957 visitor->trace(m_css); 1926 visitor->trace(m_css);
1958 visitor->trace(m_eventQueue); 1927 visitor->trace(m_eventQueue);
1959 WillBeHeapSupplementable<LocalDOMWindow>::trace(visitor); 1928 WillBeHeapSupplementable<LocalDOMWindow>::trace(visitor);
1960 EventTargetWithInlineData::trace(visitor); 1929 EventTargetWithInlineData::trace(visitor);
1961 } 1930 }
1962 1931
1963 } // namespace blink 1932 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/LocalDOMWindow.h ('k') | Source/core/frame/Window.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698