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

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

Issue 1362973004: Rename FROM_HERE to BLINK_FROM_HERE. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update Created 5 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 657 matching lines...) Expand 10 before | Expand all | Expand 10 after
668 { 668 {
669 if (!m_navigator) 669 if (!m_navigator)
670 m_navigator = Navigator::create(frame()); 670 m_navigator = Navigator::create(frame());
671 return m_navigator.get(); 671 return m_navigator.get();
672 } 672 }
673 673
674 void LocalDOMWindow::schedulePostMessage(PassRefPtrWillBeRawPtr<MessageEvent> ev ent, LocalDOMWindow* source, SecurityOrigin* target, PassRefPtrWillBeRawPtr<Scri ptCallStack> stackTrace) 674 void LocalDOMWindow::schedulePostMessage(PassRefPtrWillBeRawPtr<MessageEvent> ev ent, LocalDOMWindow* source, SecurityOrigin* target, PassRefPtrWillBeRawPtr<Scri ptCallStack> stackTrace)
675 { 675 {
676 // Schedule the message. 676 // Schedule the message.
677 OwnPtrWillBeRawPtr<PostMessageTimer> timer = adoptPtrWillBeNoop(new PostMess ageTimer(*this, event, source, target, stackTrace, UserGestureIndicator::current Token())); 677 OwnPtrWillBeRawPtr<PostMessageTimer> timer = adoptPtrWillBeNoop(new PostMess ageTimer(*this, event, source, target, stackTrace, UserGestureIndicator::current Token()));
678 timer->startOneShot(0, FROM_HERE); 678 timer->startOneShot(0, BLINK_FROM_HERE);
679 timer->suspendIfNeeded(); 679 timer->suspendIfNeeded();
680 m_postMessageTimers.add(timer.release()); 680 m_postMessageTimers.add(timer.release());
681 } 681 }
682 682
683 void LocalDOMWindow::postMessageTimerFired(PostMessageTimer* timer) 683 void LocalDOMWindow::postMessageTimerFired(PostMessageTimer* timer)
684 { 684 {
685 if (!isCurrentlyDisplayedInFrame()) { 685 if (!isCurrentlyDisplayedInFrame()) {
686 return; 686 return;
687 } 687 }
688 688
(...skipping 839 matching lines...) Expand 10 before | Expand all | Expand 10 after
1528 { 1528 {
1529 // If the LocalDOMWindow still has a frame reference, that frame must point 1529 // If the LocalDOMWindow still has a frame reference, that frame must point
1530 // back to this LocalDOMWindow: otherwise, it's easy to get into a situation 1530 // back to this LocalDOMWindow: otherwise, it's easy to get into a situation
1531 // where script execution leaks between different LocalDOMWindows. 1531 // where script execution leaks between different LocalDOMWindows.
1532 if (m_frameObserver->frame()) 1532 if (m_frameObserver->frame())
1533 RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(m_frameObserver->frame()->domWi ndow() == this); 1533 RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(m_frameObserver->frame()->domWi ndow() == this);
1534 return m_frameObserver->frame(); 1534 return m_frameObserver->frame();
1535 } 1535 }
1536 1536
1537 } // namespace blink 1537 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameView.cpp ('k') | third_party/WebKit/Source/core/frame/PlatformEventController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698