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

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

Issue 2164493002: Renamed Node::attach to Node::attachLayoutTree. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 } 348 }
349 349
350 Document* LocalDOMWindow::installNewDocument(const String& mimeType, const Docum entInit& init, bool forceXHTML) 350 Document* LocalDOMWindow::installNewDocument(const String& mimeType, const Docum entInit& init, bool forceXHTML)
351 { 351 {
352 ASSERT(init.frame() == frame()); 352 ASSERT(init.frame() == frame());
353 353
354 clearDocument(); 354 clearDocument();
355 355
356 m_document = createDocument(mimeType, init, forceXHTML); 356 m_document = createDocument(mimeType, init, forceXHTML);
357 m_eventQueue = DOMWindowEventQueue::create(m_document.get()); 357 m_eventQueue = DOMWindowEventQueue::create(m_document.get());
358 m_document->attach(); 358 m_document->attachLayoutTree();
359 359
360 if (!frame()) 360 if (!frame())
361 return m_document; 361 return m_document;
362 362
363 frame()->script().updateDocument(); 363 frame()->script().updateDocument();
364 m_document->updateViewportDescription(); 364 m_document->updateViewportDescription();
365 365
366 if (frame()->page() && frame()->view()) { 366 if (frame()->page() && frame()->view()) {
367 if (ScrollingCoordinator* scrollingCoordinator = frame()->page()->scroll ingCoordinator()) { 367 if (ScrollingCoordinator* scrollingCoordinator = frame()->page()->scroll ingCoordinator()) {
368 scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(frame()- >view(), HorizontalScrollbar); 368 scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(frame()- >view(), HorizontalScrollbar);
(...skipping 1174 matching lines...) Expand 10 before | Expand all | Expand 10 after
1543 { 1543 {
1544 // If the LocalDOMWindow still has a frame reference, that frame must point 1544 // If the LocalDOMWindow still has a frame reference, that frame must point
1545 // back to this LocalDOMWindow: otherwise, it's easy to get into a situation 1545 // back to this LocalDOMWindow: otherwise, it's easy to get into a situation
1546 // where script execution leaks between different LocalDOMWindows. 1546 // where script execution leaks between different LocalDOMWindows.
1547 if (m_frameObserver->frame()) 1547 if (m_frameObserver->frame())
1548 ASSERT_WITH_SECURITY_IMPLICATION(m_frameObserver->frame()->domWindow() = = this); 1548 ASSERT_WITH_SECURITY_IMPLICATION(m_frameObserver->frame()->domWindow() = = this);
1549 return m_frameObserver->frame(); 1549 return m_frameObserver->frame();
1550 } 1550 }
1551 1551
1552 } // namespace blink 1552 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698