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

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

Issue 879423003: Move Location to DOMWindow (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Address comments Created 5 years, 10 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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 virtual LocalFrame* frame() const override; 83 virtual LocalFrame* frame() const override;
84 Screen* screen() const override; 84 Screen* screen() const override;
85 History* history() const override; 85 History* history() const override;
86 BarProp* locationbar() const override; 86 BarProp* locationbar() const override;
87 BarProp* menubar() const override; 87 BarProp* menubar() const override;
88 BarProp* personalbar() const override; 88 BarProp* personalbar() const override;
89 BarProp* scrollbars() const override; 89 BarProp* scrollbars() const override;
90 BarProp* statusbar() const override; 90 BarProp* statusbar() const override;
91 BarProp* toolbar() const override; 91 BarProp* toolbar() const override;
92 Navigator* navigator() const override; 92 Navigator* navigator() const override;
93 Location* location() const override;
94 bool offscreenBuffering() const override; 93 bool offscreenBuffering() const override;
95 int outerHeight() const override; 94 int outerHeight() const override;
96 int outerWidth() const override; 95 int outerWidth() const override;
97 int innerHeight() const override; 96 int innerHeight() const override;
98 int innerWidth() const override; 97 int innerWidth() const override;
99 int screenX() const override; 98 int screenX() const override;
100 int screenY() const override; 99 int screenY() const override;
101 double scrollX() const override; 100 double scrollX() const override;
102 double scrollY() const override; 101 double scrollY() const override;
103 const AtomicString& name() const override; 102 const AtomicString& name() const override;
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 int requestAnimationFrame(RequestAnimationFrameCallback*) override; 141 int requestAnimationFrame(RequestAnimationFrameCallback*) override;
143 int webkitRequestAnimationFrame(RequestAnimationFrameCallback*) override; 142 int webkitRequestAnimationFrame(RequestAnimationFrameCallback*) override;
144 void cancelAnimationFrame(int id) override; 143 void cancelAnimationFrame(int id) override;
145 void postMessage(PassRefPtr<SerializedScriptValue> message, const MessagePor tArray*, const String& targetOrigin, LocalDOMWindow* source, ExceptionState&) ov erride; 144 void postMessage(PassRefPtr<SerializedScriptValue> message, const MessagePor tArray*, const String& targetOrigin, LocalDOMWindow* source, ExceptionState&) ov erride;
146 String crossDomainAccessErrorMessage(LocalDOMWindow* callingWindow) override ; 145 String crossDomainAccessErrorMessage(LocalDOMWindow* callingWindow) override ;
147 String sanitizedCrossDomainAccessErrorMessage(LocalDOMWindow* callingWindow) override; 146 String sanitizedCrossDomainAccessErrorMessage(LocalDOMWindow* callingWindow) override;
148 147
149 void registerProperty(DOMWindowProperty*); 148 void registerProperty(DOMWindowProperty*);
150 void unregisterProperty(DOMWindowProperty*); 149 void unregisterProperty(DOMWindowProperty*);
151 150
152 void reset(); 151 void reset() override;
153 152
154 unsigned pendingUnloadEventListeners() const; 153 unsigned pendingUnloadEventListeners() const;
155 154
156 static IntRect adjustWindowRect(LocalFrame&, const IntRect& pendingChanges); 155 static IntRect adjustWindowRect(LocalFrame&, const IntRect& pendingChanges);
157 156
158 bool allowPopUp(); // Call on first window, not target window. 157 bool allowPopUp(); // Call on first window, not target window.
159 static bool allowPopUp(LocalFrame& firstFrame); 158 static bool allowPopUp(LocalFrame& firstFrame);
160 static bool canShowModalDialogNow(const LocalFrame*); 159 static bool canShowModalDialogNow(const LocalFrame*);
161 160
162 Element* frameElement() const; 161 Element* frameElement() const;
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 mutable RefPtrWillBeMember<Screen> m_screen; 273 mutable RefPtrWillBeMember<Screen> m_screen;
275 mutable RefPtrWillBeMember<History> m_history; 274 mutable RefPtrWillBeMember<History> m_history;
276 mutable RefPtrWillBeMember<BarProp> m_locationbar; 275 mutable RefPtrWillBeMember<BarProp> m_locationbar;
277 mutable RefPtrWillBeMember<BarProp> m_menubar; 276 mutable RefPtrWillBeMember<BarProp> m_menubar;
278 mutable RefPtrWillBeMember<BarProp> m_personalbar; 277 mutable RefPtrWillBeMember<BarProp> m_personalbar;
279 mutable RefPtrWillBeMember<BarProp> m_scrollbars; 278 mutable RefPtrWillBeMember<BarProp> m_scrollbars;
280 mutable RefPtrWillBeMember<BarProp> m_statusbar; 279 mutable RefPtrWillBeMember<BarProp> m_statusbar;
281 mutable RefPtrWillBeMember<BarProp> m_toolbar; 280 mutable RefPtrWillBeMember<BarProp> m_toolbar;
282 mutable RefPtrWillBeMember<Console> m_console; 281 mutable RefPtrWillBeMember<Console> m_console;
283 mutable RefPtrWillBeMember<Navigator> m_navigator; 282 mutable RefPtrWillBeMember<Navigator> m_navigator;
284 mutable RefPtrWillBeMember<Location> m_location;
285 mutable RefPtrWillBeMember<StyleMedia> m_media; 283 mutable RefPtrWillBeMember<StyleMedia> m_media;
286 284
287 String m_status; 285 String m_status;
288 String m_defaultStatus; 286 String m_defaultStatus;
289 287
290 mutable RefPtrWillBeMember<ApplicationCache> m_applicationCache; 288 mutable RefPtrWillBeMember<ApplicationCache> m_applicationCache;
291 289
292 mutable RefPtrWillBeMember<Performance> m_performance; 290 mutable RefPtrWillBeMember<Performance> m_performance;
293 291
294 mutable RefPtrWillBeMember<DOMWindowCSS> m_css; 292 mutable RefPtrWillBeMember<DOMWindowCSS> m_css;
(...skipping 12 matching lines...) Expand all
307 } 305 }
308 306
309 inline String LocalDOMWindow::defaultStatus() const 307 inline String LocalDOMWindow::defaultStatus() const
310 { 308 {
311 return m_defaultStatus; 309 return m_defaultStatus;
312 } 310 }
313 311
314 } // namespace blink 312 } // namespace blink
315 313
316 #endif // LocalDOMWindow_h 314 #endif // LocalDOMWindow_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698