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

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

Issue 33523002: Have Frame::script() return a reference (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on master Created 7 years, 2 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/ContentSecurityPolicy.cpp ('k') | Source/core/frame/Frame.h » ('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 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 if (!m_document) 354 if (!m_document)
355 return; 355 return;
356 356
357 m_document->setDOMWindow(this); 357 m_document->setDOMWindow(this);
358 if (!m_document->confusingAndOftenMisusedAttached()) 358 if (!m_document->confusingAndOftenMisusedAttached())
359 m_document->attach(); 359 m_document->attach();
360 360
361 if (!m_frame) 361 if (!m_frame)
362 return; 362 return;
363 363
364 m_frame->script()->updateDocument(); 364 m_frame->script().updateDocument();
365 m_document->updateViewportDescription(); 365 m_document->updateViewportDescription();
366 366
367 if (m_frame->page() && m_frame->view()) { 367 if (m_frame->page() && m_frame->view()) {
368 if (ScrollingCoordinator* scrollingCoordinator = m_frame->page()->scroll ingCoordinator()) { 368 if (ScrollingCoordinator* scrollingCoordinator = m_frame->page()->scroll ingCoordinator()) {
369 scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(m_frame- >view(), HorizontalScrollbar); 369 scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(m_frame- >view(), HorizontalScrollbar);
370 scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(m_frame- >view(), VerticalScrollbar); 370 scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(m_frame- >view(), VerticalScrollbar);
371 scrollingCoordinator->scrollableAreaScrollLayerDidChange(m_frame->vi ew()); 371 scrollingCoordinator->scrollableAreaScrollLayerDidChange(m_frame->vi ew());
372 } 372 }
373 } 373 }
374 374
(...skipping 1392 matching lines...) Expand 10 before | Expand all | Expand 10 after
1767 return static_cast<DOMWindowLifecycleNotifier*>(LifecycleContext::lifecycleN otifier()); 1767 return static_cast<DOMWindowLifecycleNotifier*>(LifecycleContext::lifecycleN otifier());
1768 } 1768 }
1769 1769
1770 PassOwnPtr<LifecycleNotifier> DOMWindow::createLifecycleNotifier() 1770 PassOwnPtr<LifecycleNotifier> DOMWindow::createLifecycleNotifier()
1771 { 1771 {
1772 return DOMWindowLifecycleNotifier::create(this); 1772 return DOMWindowLifecycleNotifier::create(this);
1773 } 1773 }
1774 1774
1775 1775
1776 } // namespace WebCore 1776 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/frame/ContentSecurityPolicy.cpp ('k') | Source/core/frame/Frame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698