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

Unified Diff: third_party/WebKit/Source/core/dom/IntersectionObserver.cpp

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/dom/IntersectionObserver.cpp
diff --git a/third_party/WebKit/Source/core/dom/IntersectionObserver.cpp b/third_party/WebKit/Source/core/dom/IntersectionObserver.cpp
index d64ffc5b885329de57ea2d54f869002dc4237fe5..385b164093db9c77eeddc2b4899394f96c9ba7cd 100644
--- a/third_party/WebKit/Source/core/dom/IntersectionObserver.cpp
+++ b/third_party/WebKit/Source/core/dom/IntersectionObserver.cpp
@@ -86,7 +86,7 @@ IntersectionObserver* IntersectionObserver::create(const IntersectionObserverIni
RefPtrWillBeRawPtr<Node> root = observerInit.root();
if (!root) {
// TODO(szager): Use Document instead of document element for implicit root. (crbug.com/570538)
- ExecutionContext* context = callback.executionContext();
+ ExecutionContext* context = callback.getExecutionContext();
ASSERT(context->isDocument());
Frame* mainFrame = toDocument(context)->frame()->tree().top();
if (mainFrame && mainFrame->isLocalFrame())
@@ -180,7 +180,7 @@ void IntersectionObserver::observe(Element* target)
if (target->ensureIntersectionObserverData().getObservationFor(*this))
return;
- bool shouldReportRootBounds = target->document().frame()->securityContext()->securityOrigin()->canAccess(rootNode()->document().frame()->securityContext()->securityOrigin());
+ bool shouldReportRootBounds = target->document().frame()->securityContext()->getSecurityOrigin()->canAccess(rootNode()->document().frame()->securityContext()->getSecurityOrigin());
IntersectionObservation* observation = new IntersectionObservation(*this, *target, shouldReportRootBounds);
target->ensureIntersectionObserverData().addObservation(*observation);
m_observations.add(observation);
@@ -199,7 +199,7 @@ void IntersectionObserver::computeIntersectionObservations()
{
if (!m_root || !m_root->inDocument())
return;
- Document* callbackDocument = toDocument(m_callback->executionContext());
+ Document* callbackDocument = toDocument(m_callback->getExecutionContext());
if (!callbackDocument)
return;
LocalDOMWindow* callbackDOMWindow = callbackDocument->domWindow();
@@ -262,7 +262,7 @@ String IntersectionObserver::rootMargin() const
void IntersectionObserver::enqueueIntersectionObserverEntry(IntersectionObserverEntry& entry)
{
m_entries.append(&entry);
- toDocument(m_callback->executionContext())->ensureIntersectionObserverController().scheduleIntersectionObserverForDelivery(*this);
+ toDocument(m_callback->getExecutionContext())->ensureIntersectionObserverController().scheduleIntersectionObserverForDelivery(*this);
}
static LayoutUnit computeMargin(const Length& length, LayoutUnit referenceLength)
« no previous file with comments | « third_party/WebKit/Source/core/dom/Fullscreen.cpp ('k') | third_party/WebKit/Source/core/dom/IntersectionObserverCallback.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698