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

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

Issue 1135633004: Revert of Make createWindow (mostly) work with OOPIF (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 7 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
« no previous file with comments | « no previous file | Source/core/frame/LocalDOMWindow.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 void cancelAnimationFrame(int id) override; 147 void cancelAnimationFrame(int id) override;
148 void schedulePostMessage(PassRefPtrWillBeRawPtr<MessageEvent>, LocalDOMWindo w* source, SecurityOrigin* target, PassRefPtrWillBeRawPtr<ScriptCallStack> stack Trace); 148 void schedulePostMessage(PassRefPtrWillBeRawPtr<MessageEvent>, LocalDOMWindo w* source, SecurityOrigin* target, PassRefPtrWillBeRawPtr<ScriptCallStack> stack Trace);
149 149
150 void registerProperty(DOMWindowProperty*); 150 void registerProperty(DOMWindowProperty*);
151 void unregisterProperty(DOMWindowProperty*); 151 void unregisterProperty(DOMWindowProperty*);
152 152
153 void reset(); 153 void reset();
154 154
155 unsigned pendingUnloadEventListeners() const; 155 unsigned pendingUnloadEventListeners() const;
156 156
157 static IntRect adjustWindowRect(LocalFrame&, const IntRect& pendingChanges);
158
157 bool allowPopUp(); // Call on first window, not target window. 159 bool allowPopUp(); // Call on first window, not target window.
158 static bool allowPopUp(LocalFrame& firstFrame); 160 static bool allowPopUp(LocalFrame& firstFrame);
159 161
160 Element* frameElement() const; 162 Element* frameElement() const;
161 163
162 PassRefPtrWillBeRawPtr<DOMWindow> open(const String& urlString, const Atomic String& frameName, const String& windowFeaturesString, 164 PassRefPtrWillBeRawPtr<DOMWindow> open(const String& urlString, const Atomic String& frameName, const String& windowFeaturesString,
163 LocalDOMWindow* callingWindow, LocalDOMWindow* enteredWindow); 165 LocalDOMWindow* callingWindow, LocalDOMWindow* enteredWindow);
164 166
165 FrameConsole* frameConsole() const; 167 FrameConsole* frameConsole() const;
166 168
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 } 287 }
286 288
287 inline String LocalDOMWindow::defaultStatus() const 289 inline String LocalDOMWindow::defaultStatus() const
288 { 290 {
289 return m_defaultStatus; 291 return m_defaultStatus;
290 } 292 }
291 293
292 } // namespace blink 294 } // namespace blink
293 295
294 #endif // LocalDOMWindow_h 296 #endif // LocalDOMWindow_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/frame/LocalDOMWindow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698