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

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

Issue 214563004: Oilpan: move WebKitPoint to the oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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 | « Source/core/frame/DOMWindow.h ('k') | Source/core/frame/WebKitPoint.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 1299 matching lines...) Expand 10 before | Expand all | Expand 10 after
1310 unsigned colonStart = pseudoElement[0] == ':' ? (pseudoElement[1] == ':' ? 2 : 1) : 0; 1310 unsigned colonStart = pseudoElement[0] == ':' ? (pseudoElement[1] == ':' ? 2 : 1) : 0;
1311 CSSSelector::PseudoType pseudoType = CSSSelector::parsePseudoType(AtomicStri ng(pseudoElement.substring(colonStart))); 1311 CSSSelector::PseudoType pseudoType = CSSSelector::parsePseudoType(AtomicStri ng(pseudoElement.substring(colonStart)));
1312 if (pseudoType == CSSSelector::PseudoUnknown && !pseudoElement.isEmpty()) 1312 if (pseudoType == CSSSelector::PseudoUnknown && !pseudoElement.isEmpty())
1313 return nullptr; 1313 return nullptr;
1314 1314
1315 unsigned rulesToInclude = StyleResolver::AuthorCSSRules; 1315 unsigned rulesToInclude = StyleResolver::AuthorCSSRules;
1316 PseudoId pseudoId = CSSSelector::pseudoId(pseudoType); 1316 PseudoId pseudoId = CSSSelector::pseudoId(pseudoType);
1317 return m_frame->document()->ensureStyleResolver().pseudoCSSRulesForElement(e lement, pseudoId, rulesToInclude); 1317 return m_frame->document()->ensureStyleResolver().pseudoCSSRulesForElement(e lement, pseudoId, rulesToInclude);
1318 } 1318 }
1319 1319
1320 PassRefPtr<DOMPoint> DOMWindow::webkitConvertPointFromNodeToPage(Node* node, con st DOMPoint* p) const 1320 PassRefPtrWillBeRawPtr<DOMPoint> DOMWindow::webkitConvertPointFromNodeToPage(Nod e* node, const DOMPoint* p) const
1321 { 1321 {
1322 if (!node || !p) 1322 if (!node || !p)
1323 return nullptr; 1323 return nullptr;
1324 1324
1325 if (!document()) 1325 if (!document())
1326 return nullptr; 1326 return nullptr;
1327 1327
1328 document()->updateLayoutIgnorePendingStylesheets(); 1328 document()->updateLayoutIgnorePendingStylesheets();
1329 1329
1330 FloatPoint pagePoint(p->x(), p->y()); 1330 FloatPoint pagePoint(p->x(), p->y());
1331 pagePoint = node->convertToPage(pagePoint); 1331 pagePoint = node->convertToPage(pagePoint);
1332 return DOMPoint::create(pagePoint.x(), pagePoint.y()); 1332 return DOMPoint::create(pagePoint.x(), pagePoint.y());
1333 } 1333 }
1334 1334
1335 PassRefPtr<DOMPoint> DOMWindow::webkitConvertPointFromPageToNode(Node* node, con st DOMPoint* p) const 1335 PassRefPtrWillBeRawPtr<DOMPoint> DOMWindow::webkitConvertPointFromPageToNode(Nod e* node, const DOMPoint* p) const
1336 { 1336 {
1337 if (!node || !p) 1337 if (!node || !p)
1338 return nullptr; 1338 return nullptr;
1339 1339
1340 if (!document()) 1340 if (!document())
1341 return nullptr; 1341 return nullptr;
1342 1342
1343 document()->updateLayoutIgnorePendingStylesheets(); 1343 document()->updateLayoutIgnorePendingStylesheets();
1344 1344
1345 FloatPoint nodePoint(p->x(), p->y()); 1345 FloatPoint nodePoint(p->x(), p->y());
(...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after
1881 visitor->trace(m_sessionStorage); 1881 visitor->trace(m_sessionStorage);
1882 visitor->trace(m_localStorage); 1882 visitor->trace(m_localStorage);
1883 visitor->trace(m_applicationCache); 1883 visitor->trace(m_applicationCache);
1884 visitor->trace(m_performance); 1884 visitor->trace(m_performance);
1885 #if ENABLE(OILPAN) 1885 #if ENABLE(OILPAN)
1886 HeapSupplementable<DOMWindow>::trace(visitor); 1886 HeapSupplementable<DOMWindow>::trace(visitor);
1887 #endif 1887 #endif
1888 } 1888 }
1889 1889
1890 } // namespace WebCore 1890 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/frame/DOMWindow.h ('k') | Source/core/frame/WebKitPoint.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698