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

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

Issue 2704133002: Associate Location with DOMWindow instead of Frame. (Closed)
Patch Set: fix typos, consistent naming Created 3 years, 10 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) 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 462 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 LocalDOMWindow* LocalDOMWindow::toLocalDOMWindow() { 473 LocalDOMWindow* LocalDOMWindow::toLocalDOMWindow() {
474 return this; 474 return this;
475 } 475 }
476 476
477 MediaQueryList* LocalDOMWindow::matchMedia(const String& media) { 477 MediaQueryList* LocalDOMWindow::matchMedia(const String& media) {
478 return document() ? document()->mediaQueryMatcher().matchMedia(media) 478 return document() ? document()->mediaQueryMatcher().matchMedia(media)
479 : nullptr; 479 : nullptr;
480 } 480 }
481 481
482 void LocalDOMWindow::frameDestroyed() { 482 void LocalDOMWindow::frameDestroyed() {
483 resetLocation();
484 removeAllEventListeners(); 483 removeAllEventListeners();
485 disconnectFromFrame(); 484 disconnectFromFrame();
486 } 485 }
487 486
488 void LocalDOMWindow::registerEventListenerObserver( 487 void LocalDOMWindow::registerEventListenerObserver(
489 EventListenerObserver* eventListenerObserver) { 488 EventListenerObserver* eventListenerObserver) {
490 m_eventListenerObservers.insert(eventListenerObserver); 489 m_eventListenerObservers.insert(eventListenerObserver);
491 } 490 }
492 491
493 void LocalDOMWindow::reset() { 492 void LocalDOMWindow::reset() {
(...skipping 1138 matching lines...) Expand 10 before | Expand all | Expand 10 after
1632 DOMWindow::trace(visitor); 1631 DOMWindow::trace(visitor);
1633 Supplementable<LocalDOMWindow>::trace(visitor); 1632 Supplementable<LocalDOMWindow>::trace(visitor);
1634 } 1633 }
1635 1634
1636 DEFINE_TRACE_WRAPPERS(LocalDOMWindow) { 1635 DEFINE_TRACE_WRAPPERS(LocalDOMWindow) {
1637 visitor->traceWrappers(m_customElements); 1636 visitor->traceWrappers(m_customElements);
1638 DOMWindow::traceWrappers(visitor); 1637 DOMWindow::traceWrappers(visitor);
1639 } 1638 }
1640 1639
1641 } // namespace blink 1640 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698