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

Side by Side Diff: trunk/Source/core/frame/LocalDOMWindow.h

Issue 1176113004: Revert 196930 "Window.postMessage() to self can cause document l..." (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 5 years, 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2009, 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 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 Element* frameElement() const; 161 Element* frameElement() const;
162 162
163 PassRefPtrWillBeRawPtr<DOMWindow> open(const String& urlString, const Atomic String& frameName, const String& windowFeaturesString, 163 PassRefPtrWillBeRawPtr<DOMWindow> open(const String& urlString, const Atomic String& frameName, const String& windowFeaturesString,
164 LocalDOMWindow* callingWindow, LocalDOMWindow* enteredWindow); 164 LocalDOMWindow* callingWindow, LocalDOMWindow* enteredWindow);
165 165
166 FrameConsole* frameConsole() const; 166 FrameConsole* frameConsole() const;
167 167
168 void printErrorMessage(const String&); 168 void printErrorMessage(const String&);
169 169
170 void postMessageTimerFired(PostMessageTimer*); 170 void postMessageTimerFired(PostMessageTimer*);
171 void removePostMessageTimer(PostMessageTimer*);
172 void dispatchMessageEventWithOriginCheck(SecurityOrigin* intendedTargetOrigi n, PassRefPtrWillBeRawPtr<Event>, PassRefPtrWillBeRawPtr<ScriptCallStack>); 171 void dispatchMessageEventWithOriginCheck(SecurityOrigin* intendedTargetOrigi n, PassRefPtrWillBeRawPtr<Event>, PassRefPtrWillBeRawPtr<ScriptCallStack>);
173 172
174 // Events 173 // Events
175 // EventTarget API 174 // EventTarget API
176 virtual bool addEventListener(const AtomicString& eventType, PassRefPtr<Even tListener>, bool useCapture = false) override; 175 virtual bool addEventListener(const AtomicString& eventType, PassRefPtr<Even tListener>, bool useCapture = false) override;
177 virtual bool removeEventListener(const AtomicString& eventType, PassRefPtr<E ventListener>, bool useCapture = false) override; 176 virtual bool removeEventListener(const AtomicString& eventType, PassRefPtr<E ventListener>, bool useCapture = false) override;
178 virtual void removeAllEventListeners() override; 177 virtual void removeAllEventListeners() override;
179 178
180 using EventTarget::dispatchEvent; 179 using EventTarget::dispatchEvent;
181 bool dispatchEvent(PassRefPtrWillBeRawPtr<Event> prpEvent, PassRefPtrWillBeR awPtr<EventTarget> prpTarget); 180 bool dispatchEvent(PassRefPtrWillBeRawPtr<Event> prpEvent, PassRefPtrWillBeR awPtr<EventTarget> prpTarget);
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 } 284 }
286 285
287 inline String LocalDOMWindow::defaultStatus() const 286 inline String LocalDOMWindow::defaultStatus() const
288 { 287 {
289 return m_defaultStatus; 288 return m_defaultStatus;
290 } 289 }
291 290
292 } // namespace blink 291 } // namespace blink
293 292
294 #endif // LocalDOMWindow_h 293 #endif // LocalDOMWindow_h
OLDNEW
« no previous file with comments | « trunk/LayoutTests/fast/dom/Window/post-message-to-self-expected.txt ('k') | trunk/Source/core/frame/LocalDOMWindow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698