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

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: Remove DOMWindowProperty changes 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 virtual LocalFrame* frame() const override; 84 virtual LocalFrame* frame() const override;
85 Screen* screen() const override; 85 Screen* screen() const override;
86 History* history() const override; 86 History* history() const override;
87 BarProp* locationbar() const override; 87 BarProp* locationbar() const override;
88 BarProp* menubar() const override; 88 BarProp* menubar() const override;
89 BarProp* personalbar() const override; 89 BarProp* personalbar() const override;
90 BarProp* scrollbars() const override; 90 BarProp* scrollbars() const override;
91 BarProp* statusbar() const override; 91 BarProp* statusbar() const override;
92 BarProp* toolbar() const override; 92 BarProp* toolbar() const override;
93 Navigator* navigator() const override; 93 Navigator* navigator() const override;
94 Location* location() const override;
95 bool offscreenBuffering() const override; 94 bool offscreenBuffering() const override;
96 int outerHeight() const override; 95 int outerHeight() const override;
97 int outerWidth() const override; 96 int outerWidth() const override;
98 int innerHeight() const override; 97 int innerHeight() const override;
99 int innerWidth() const override; 98 int innerWidth() const override;
100 int screenX() const override; 99 int screenX() const override;
101 int screenY() const override; 100 int screenY() const override;
102 double scrollX() const override; 101 double scrollX() const override;
103 double scrollY() const override; 102 double scrollY() const override;
104 const AtomicString& name() const override; 103 const AtomicString& name() const override;
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 int requestAnimationFrame(RequestAnimationFrameCallback*) override; 142 int requestAnimationFrame(RequestAnimationFrameCallback*) override;
144 int webkitRequestAnimationFrame(RequestAnimationFrameCallback*) override; 143 int webkitRequestAnimationFrame(RequestAnimationFrameCallback*) override;
145 void cancelAnimationFrame(int id) override; 144 void cancelAnimationFrame(int id) override;
146 void postMessage(PassRefPtr<SerializedScriptValue> message, const MessagePor tArray*, const String& targetOrigin, LocalDOMWindow* source, ExceptionState&) ov erride; 145 void postMessage(PassRefPtr<SerializedScriptValue> message, const MessagePor tArray*, const String& targetOrigin, LocalDOMWindow* source, ExceptionState&) ov erride;
147 String crossDomainAccessErrorMessage(LocalDOMWindow* callingWindow) override ; 146 String crossDomainAccessErrorMessage(LocalDOMWindow* callingWindow) override ;
148 String sanitizedCrossDomainAccessErrorMessage(LocalDOMWindow* callingWindow) override; 147 String sanitizedCrossDomainAccessErrorMessage(LocalDOMWindow* callingWindow) override;
149 148
150 void registerProperty(DOMWindowProperty*); 149 void registerProperty(DOMWindowProperty*);
151 void unregisterProperty(DOMWindowProperty*); 150 void unregisterProperty(DOMWindowProperty*);
152 151
153 void reset(); 152 void reset() override;
154 153
155 unsigned pendingUnloadEventListeners() const; 154 unsigned pendingUnloadEventListeners() const;
156 155
157 static IntRect adjustWindowRect(LocalFrame&, const IntRect& pendingChanges); 156 static IntRect adjustWindowRect(LocalFrame&, const IntRect& pendingChanges);
158 157
159 bool allowPopUp(); // Call on first window, not target window. 158 bool allowPopUp(); // Call on first window, not target window.
160 static bool allowPopUp(LocalFrame& firstFrame); 159 static bool allowPopUp(LocalFrame& firstFrame);
161 static bool canShowModalDialogNow(const LocalFrame*); 160 static bool canShowModalDialogNow(const LocalFrame*);
162 161
163 Element* frameElement() const; 162 Element* frameElement() const;
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 mutable RefPtrWillBeMember<Screen> m_screen; 279 mutable RefPtrWillBeMember<Screen> m_screen;
281 mutable RefPtrWillBeMember<History> m_history; 280 mutable RefPtrWillBeMember<History> m_history;
282 mutable RefPtrWillBeMember<BarProp> m_locationbar; 281 mutable RefPtrWillBeMember<BarProp> m_locationbar;
283 mutable RefPtrWillBeMember<BarProp> m_menubar; 282 mutable RefPtrWillBeMember<BarProp> m_menubar;
284 mutable RefPtrWillBeMember<BarProp> m_personalbar; 283 mutable RefPtrWillBeMember<BarProp> m_personalbar;
285 mutable RefPtrWillBeMember<BarProp> m_scrollbars; 284 mutable RefPtrWillBeMember<BarProp> m_scrollbars;
286 mutable RefPtrWillBeMember<BarProp> m_statusbar; 285 mutable RefPtrWillBeMember<BarProp> m_statusbar;
287 mutable RefPtrWillBeMember<BarProp> m_toolbar; 286 mutable RefPtrWillBeMember<BarProp> m_toolbar;
288 mutable RefPtrWillBeMember<Console> m_console; 287 mutable RefPtrWillBeMember<Console> m_console;
289 mutable RefPtrWillBeMember<Navigator> m_navigator; 288 mutable RefPtrWillBeMember<Navigator> m_navigator;
290 mutable RefPtrWillBeMember<Location> m_location;
291 mutable RefPtrWillBeMember<StyleMedia> m_media; 289 mutable RefPtrWillBeMember<StyleMedia> m_media;
292 290
293 String m_status; 291 String m_status;
294 String m_defaultStatus; 292 String m_defaultStatus;
295 293
296 mutable RefPtrWillBeMember<ApplicationCache> m_applicationCache; 294 mutable RefPtrWillBeMember<ApplicationCache> m_applicationCache;
297 295
298 mutable RefPtrWillBeMember<Performance> m_performance; 296 mutable RefPtrWillBeMember<Performance> m_performance;
299 297
300 mutable RefPtrWillBeMember<DOMWindowCSS> m_css; 298 mutable RefPtrWillBeMember<DOMWindowCSS> m_css;
(...skipping 12 matching lines...) Expand all
313 } 311 }
314 312
315 inline String LocalDOMWindow::defaultStatus() const 313 inline String LocalDOMWindow::defaultStatus() const
316 { 314 {
317 return m_defaultStatus; 315 return m_defaultStatus;
318 } 316 }
319 317
320 } // namespace blink 318 } // namespace blink
321 319
322 #endif // LocalDOMWindow_h 320 #endif // LocalDOMWindow_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698