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

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

Issue 1008113002: Remove LifecycleNotifier<>::m_context. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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/DOMWindowLifecycleNotifier.cpp ('k') | Source/core/page/Page.cpp » ('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 355 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 Settings* settings = firstFrame.settings(); 366 Settings* settings = firstFrame.settings();
367 return settings && settings->javaScriptCanOpenWindowsAutomatically(); 367 return settings && settings->javaScriptCanOpenWindowsAutomatically();
368 } 368 }
369 369
370 bool LocalDOMWindow::allowPopUp() 370 bool LocalDOMWindow::allowPopUp()
371 { 371 {
372 return frame() && allowPopUp(*frame()); 372 return frame() && allowPopUp(*frame());
373 } 373 }
374 374
375 LocalDOMWindow::LocalDOMWindow(LocalFrame& frame) 375 LocalDOMWindow::LocalDOMWindow(LocalFrame& frame)
376 : DOMWindowLifecycleNotifier(this) 376 : m_frameObserver(WindowFrameObserver::create(this, frame))
377 , m_frameObserver(WindowFrameObserver::create(this, frame))
378 , m_shouldPrintWhenFinishedLoading(false) 377 , m_shouldPrintWhenFinishedLoading(false)
379 #if ENABLE(ASSERT) 378 #if ENABLE(ASSERT)
380 , m_hasBeenReset(false) 379 , m_hasBeenReset(false)
381 #endif 380 #endif
382 { 381 {
383 } 382 }
384 383
385 void LocalDOMWindow::clearDocument() 384 void LocalDOMWindow::clearDocument()
386 { 385 {
387 if (!m_document) 386 if (!m_document)
(...skipping 1394 matching lines...) Expand 10 before | Expand all | Expand 10 after
1782 return m_frameObserver->frame(); 1781 return m_frameObserver->frame();
1783 } 1782 }
1784 1783
1785 v8::Handle<v8::Object> LocalDOMWindow::wrap(v8::Handle<v8::Object> creationConte xt, v8::Isolate* isolate) 1784 v8::Handle<v8::Object> LocalDOMWindow::wrap(v8::Handle<v8::Object> creationConte xt, v8::Isolate* isolate)
1786 { 1785 {
1787 ASSERT_NOT_REACHED(); // LocalDOMWindow has [Custom=ToV8]. 1786 ASSERT_NOT_REACHED(); // LocalDOMWindow has [Custom=ToV8].
1788 return v8::Handle<v8::Object>(); 1787 return v8::Handle<v8::Object>();
1789 } 1788 }
1790 1789
1791 } // namespace blink 1790 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/DOMWindowLifecycleNotifier.cpp ('k') | Source/core/page/Page.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698