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

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

Issue 2432933005: Revert "Log to UMA why we would load a third-party frame" (Closed)
Patch Set: Created 4 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
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 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 frame()->page()->scrollingCoordinator()) { 342 frame()->page()->scrollingCoordinator()) {
343 scrollingCoordinator->scrollableAreaScrollbarLayerDidChange( 343 scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(
344 frame()->view(), HorizontalScrollbar); 344 frame()->view(), HorizontalScrollbar);
345 scrollingCoordinator->scrollableAreaScrollbarLayerDidChange( 345 scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(
346 frame()->view(), VerticalScrollbar); 346 frame()->view(), VerticalScrollbar);
347 scrollingCoordinator->scrollableAreaScrollLayerDidChange(frame()->view()); 347 scrollingCoordinator->scrollableAreaScrollLayerDidChange(frame()->view());
348 } 348 }
349 } 349 }
350 350
351 frame()->selection().updateSecureKeyboardEntryIfActive(); 351 frame()->selection().updateSecureKeyboardEntryIfActive();
352
353 m_document->maybeRecordLoadReason(Created);
354
355 return m_document; 352 return m_document;
356 } 353 }
357 354
358 EventQueue* LocalDOMWindow::getEventQueue() const { 355 EventQueue* LocalDOMWindow::getEventQueue() const {
359 return m_eventQueue.get(); 356 return m_eventQueue.get();
360 } 357 }
361 358
362 void LocalDOMWindow::enqueueWindowEvent(Event* event) { 359 void LocalDOMWindow::enqueueWindowEvent(Event* event) {
363 if (!m_eventQueue) 360 if (!m_eventQueue)
364 return; 361 return;
(...skipping 1193 matching lines...) Expand 10 before | Expand all | Expand 10 after
1558 1555
1559 LocalFrame* LocalDOMWindow::frame() const { 1556 LocalFrame* LocalDOMWindow::frame() const {
1560 // If the LocalDOMWindow still has a frame reference, that frame must point 1557 // If the LocalDOMWindow still has a frame reference, that frame must point
1561 // back to this LocalDOMWindow: otherwise, it's easy to get into a situation 1558 // back to this LocalDOMWindow: otherwise, it's easy to get into a situation
1562 // where script execution leaks between different LocalDOMWindows. 1559 // where script execution leaks between different LocalDOMWindows.
1563 SECURITY_DCHECK(!m_frame || m_frame->domWindow() == this); 1560 SECURITY_DCHECK(!m_frame || m_frame->domWindow() == this);
1564 return m_frame; 1561 return m_frame;
1565 } 1562 }
1566 1563
1567 } // namespace blink 1564 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameView.cpp ('k') | third_party/WebKit/Source/web/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698