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

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

Issue 2516473002: Cross-origin iframes: collect data under hypothetical loading strategies (Closed)
Patch Set: Do arithmetic instead of intersects Created 4 years 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 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 scrollingCoordinator->scrollableAreaScrollbarLayerDidChange( 347 scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(
348 frame()->view(), HorizontalScrollbar); 348 frame()->view(), HorizontalScrollbar);
349 scrollingCoordinator->scrollableAreaScrollbarLayerDidChange( 349 scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(
350 frame()->view(), VerticalScrollbar); 350 frame()->view(), VerticalScrollbar);
351 scrollingCoordinator->scrollableAreaScrollLayerDidChange(frame()->view()); 351 scrollingCoordinator->scrollableAreaScrollLayerDidChange(frame()->view());
352 } 352 }
353 } 353 }
354 354
355 frame()->selection().updateSecureKeyboardEntryIfActive(); 355 frame()->selection().updateSecureKeyboardEntryIfActive();
356 356
357 m_document->maybeRecordLoadReason(Created); 357 if (frame()->isCrossOriginSubframe())
358 m_document->recordDeferredLoadReason(Created);
358 359
359 return m_document; 360 return m_document;
360 } 361 }
361 362
362 EventQueue* LocalDOMWindow::getEventQueue() const { 363 EventQueue* LocalDOMWindow::getEventQueue() const {
363 return m_eventQueue.get(); 364 return m_eventQueue.get();
364 } 365 }
365 366
366 void LocalDOMWindow::enqueueWindowEvent(Event* event) { 367 void LocalDOMWindow::enqueueWindowEvent(Event* event) {
367 if (!m_eventQueue) 368 if (!m_eventQueue)
(...skipping 1204 matching lines...) Expand 10 before | Expand all | Expand 10 after
1572 1573
1573 LocalFrame* LocalDOMWindow::frame() const { 1574 LocalFrame* LocalDOMWindow::frame() const {
1574 // If the LocalDOMWindow still has a frame reference, that frame must point 1575 // If the LocalDOMWindow still has a frame reference, that frame must point
1575 // back to this LocalDOMWindow: otherwise, it's easy to get into a situation 1576 // back to this LocalDOMWindow: otherwise, it's easy to get into a situation
1576 // where script execution leaks between different LocalDOMWindows. 1577 // where script execution leaks between different LocalDOMWindows.
1577 SECURITY_DCHECK(!m_frame || m_frame->domWindow() == this); 1578 SECURITY_DCHECK(!m_frame || m_frame->domWindow() == this);
1578 return m_frame; 1579 return m_frame;
1579 } 1580 }
1580 1581
1581 } // namespace blink 1582 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698