| OLD | NEW | 
|---|
| 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 127 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 138     void resizeTo(int width, int height) const override; | 138     void resizeTo(int width, int height) const override; | 
| 139     MediaQueryList* matchMedia(const String&) override; | 139     MediaQueryList* matchMedia(const String&) override; | 
| 140     CSSStyleDeclaration* getComputedStyle(Element*, const String& pseudoElt) con
     st override; | 140     CSSStyleDeclaration* getComputedStyle(Element*, const String& pseudoElt) con
     st override; | 
| 141     CSSRuleList* getMatchedCSSRules(Element*, const String& pseudoElt) const ove
     rride; | 141     CSSRuleList* getMatchedCSSRules(Element*, const String& pseudoElt) const ove
     rride; | 
| 142     int requestAnimationFrame(FrameRequestCallback*) override; | 142     int requestAnimationFrame(FrameRequestCallback*) override; | 
| 143     int webkitRequestAnimationFrame(FrameRequestCallback*) override; | 143     int webkitRequestAnimationFrame(FrameRequestCallback*) override; | 
| 144     void cancelAnimationFrame(int id) override; | 144     void cancelAnimationFrame(int id) override; | 
| 145     int requestIdleCallback(IdleRequestCallback*, const IdleRequestOptions&) ove
     rride; | 145     int requestIdleCallback(IdleRequestCallback*, const IdleRequestOptions&) ove
     rride; | 
| 146     void cancelIdleCallback(int id) override; | 146     void cancelIdleCallback(int id) override; | 
| 147     CustomElementsRegistry* customElements(ScriptState*) const override; | 147     CustomElementsRegistry* customElements(ScriptState*) const override; | 
|  | 148     CustomElementsRegistry* customElements() const; | 
| 148 | 149 | 
| 149     void registerProperty(DOMWindowProperty*); | 150     void registerProperty(DOMWindowProperty*); | 
| 150     void unregisterProperty(DOMWindowProperty*); | 151     void unregisterProperty(DOMWindowProperty*); | 
| 151 | 152 | 
| 152     void reset(); | 153     void reset(); | 
| 153 | 154 | 
| 154     unsigned pendingUnloadEventListeners() const; | 155     unsigned pendingUnloadEventListeners() const; | 
| 155 | 156 | 
| 156     bool allowPopUp(); // Call on first window, not target window. | 157     bool allowPopUp(); // Call on first window, not target window. | 
| 157     static bool allowPopUp(LocalFrame& firstFrame); | 158     static bool allowPopUp(LocalFrame& firstFrame); | 
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 263 } | 264 } | 
| 264 | 265 | 
| 265 inline String LocalDOMWindow::defaultStatus() const | 266 inline String LocalDOMWindow::defaultStatus() const | 
| 266 { | 267 { | 
| 267     return m_defaultStatus; | 268     return m_defaultStatus; | 
| 268 } | 269 } | 
| 269 | 270 | 
| 270 } // namespace blink | 271 } // namespace blink | 
| 271 | 272 | 
| 272 #endif // LocalDOMWindow_h | 273 #endif // LocalDOMWindow_h | 
| OLD | NEW | 
|---|