| Index: Source/core/frame/LocalDOMWindow.h
|
| diff --git a/Source/core/frame/LocalDOMWindow.h b/Source/core/frame/LocalDOMWindow.h
|
| index 9eb1489b85def56d8e3fa5e29da3f725d181825a..955475e2693e62201f363ff20bcd1ccd63782569 100644
|
| --- a/Source/core/frame/LocalDOMWindow.h
|
| +++ b/Source/core/frame/LocalDOMWindow.h
|
| @@ -24,8 +24,8 @@
|
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#ifndef DOMWindow_h
|
| -#define DOMWindow_h
|
| +#ifndef LocalDOMWindow_h
|
| +#define LocalDOMWindow_h
|
|
|
| #include "bindings/core/v8/Dictionary.h"
|
| #include "core/events/EventTarget.h"
|
| @@ -39,372 +39,374 @@
|
| #include "wtf/Forward.h"
|
|
|
| namespace blink {
|
| - class ApplicationCache;
|
| - class BarProp;
|
| - class CSSRuleList;
|
| - class CSSStyleDeclaration;
|
| - class Console;
|
| - class DOMSelection;
|
| - class DOMURL;
|
| - class DOMWindowProperty;
|
| - class Database;
|
| - class DatabaseCallback;
|
| - class Document;
|
| - class DocumentInit;
|
| - class DOMWindowEventQueue;
|
| - class DOMWindowLifecycleNotifier;
|
| - class Element;
|
| - class EventListener;
|
| - class EventQueue;
|
| - class ExceptionState;
|
| - class FloatRect;
|
| - class FrameConsole;
|
| - class History;
|
| - class IDBFactory;
|
| - class LocalFrame;
|
| - class Location;
|
| - class MediaQueryList;
|
| - class MessageEvent;
|
| - class Navigator;
|
| - class Node;
|
| - class Page;
|
| - class Performance;
|
| - class PostMessageTimer;
|
| - class RequestAnimationFrameCallback;
|
| - class ScheduledAction;
|
| - class Screen;
|
| - class ScriptCallStack;
|
| - class SecurityOrigin;
|
| - class SerializedScriptValue;
|
| - class Storage;
|
| - class StyleMedia;
|
| - class DOMWindowCSS;
|
| -
|
| - struct WindowFeatures;
|
| -
|
| - typedef WillBeHeapVector<RefPtrWillBeMember<MessagePort>, 1> MessagePortArray;
|
| +
|
| +class ApplicationCache;
|
| +class BarProp;
|
| +class CSSRuleList;
|
| +class CSSStyleDeclaration;
|
| +class Console;
|
| +class DOMSelection;
|
| +class DOMURL;
|
| +class DOMWindowCSS;
|
| +class DOMWindowEventQueue;
|
| +class DOMWindowLifecycleNotifier;
|
| +class DOMWindowProperty;
|
| +class Database;
|
| +class DatabaseCallback;
|
| +class Document;
|
| +class DocumentInit;
|
| +class Element;
|
| +class EventListener;
|
| +class EventQueue;
|
| +class ExceptionState;
|
| +class FloatRect;
|
| +class FrameConsole;
|
| +class History;
|
| +class IDBFactory;
|
| +class LocalFrame;
|
| +class Location;
|
| +class MediaQueryList;
|
| +class MessageEvent;
|
| +class Navigator;
|
| +class Node;
|
| +class Page;
|
| +class Performance;
|
| +class PostMessageTimer;
|
| +class RequestAnimationFrameCallback;
|
| +class ScheduledAction;
|
| +class Screen;
|
| +class ScriptCallStack;
|
| +class SecurityOrigin;
|
| +class SerializedScriptValue;
|
| +class Storage;
|
| +class StyleMedia;
|
| +
|
| +struct WindowFeatures;
|
| +
|
| +typedef WillBeHeapVector<RefPtrWillBeMember<MessagePort>, 1> MessagePortArray;
|
|
|
| enum PageshowEventPersistence {
|
| PageshowEventNotPersisted = 0,
|
| PageshowEventPersisted = 1
|
| };
|
|
|
| - enum SetLocationLocking { LockHistoryBasedOnGestureState, LockHistoryAndBackForwardList };
|
| +enum SetLocationLocking { LockHistoryBasedOnGestureState, LockHistoryAndBackForwardList };
|
|
|
| - class LocalDOMWindow FINAL : public RefCountedWillBeGarbageCollectedFinalized<LocalDOMWindow>, public EventTargetWithInlineData, public DOMWindowBase64, public FrameDestructionObserver, public WillBeHeapSupplementable<LocalDOMWindow>, public LifecycleContext<LocalDOMWindow> {
|
| - WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(LocalDOMWindow);
|
| - REFCOUNTED_EVENT_TARGET(LocalDOMWindow);
|
| - public:
|
| - static PassRefPtrWillBeRawPtr<Document> createDocument(const String& mimeType, const DocumentInit&, bool forceXHTML);
|
| - static PassRefPtrWillBeRawPtr<LocalDOMWindow> create(LocalFrame& frame)
|
| - {
|
| - return adoptRefWillBeNoop(new LocalDOMWindow(frame));
|
| - }
|
| - virtual ~LocalDOMWindow();
|
| +class LocalDOMWindow FINAL : public RefCountedWillBeGarbageCollectedFinalized<LocalDOMWindow>, public EventTargetWithInlineData, public DOMWindowBase64, public FrameDestructionObserver, public WillBeHeapSupplementable<LocalDOMWindow>, public LifecycleContext<LocalDOMWindow> {
|
| + DEFINE_WRAPPERTYPEINFO();
|
| + REFCOUNTED_EVENT_TARGET(LocalDOMWindow);
|
| + WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(LocalDOMWindow);
|
| +public:
|
| + static PassRefPtrWillBeRawPtr<Document> createDocument(const String& mimeType, const DocumentInit&, bool forceXHTML);
|
| + static PassRefPtrWillBeRawPtr<LocalDOMWindow> create(LocalFrame& frame)
|
| + {
|
| + return adoptRefWillBeNoop(new LocalDOMWindow(frame));
|
| + }
|
| + virtual ~LocalDOMWindow();
|
|
|
| - PassRefPtrWillBeRawPtr<Document> installNewDocument(const String& mimeType, const DocumentInit&, bool forceXHTML = false);
|
| + PassRefPtrWillBeRawPtr<Document> installNewDocument(const String& mimeType, const DocumentInit&, bool forceXHTML = false);
|
|
|
| - virtual const AtomicString& interfaceName() const OVERRIDE;
|
| - virtual ExecutionContext* executionContext() const OVERRIDE;
|
| + virtual const AtomicString& interfaceName() const OVERRIDE;
|
| + virtual ExecutionContext* executionContext() const OVERRIDE;
|
|
|
| - virtual LocalDOMWindow* toDOMWindow() OVERRIDE;
|
| + virtual LocalDOMWindow* toDOMWindow() OVERRIDE;
|
|
|
| - void registerProperty(DOMWindowProperty*);
|
| - void unregisterProperty(DOMWindowProperty*);
|
| + void registerProperty(DOMWindowProperty*);
|
| + void unregisterProperty(DOMWindowProperty*);
|
|
|
| - void reset();
|
| + void reset();
|
|
|
| - PassRefPtrWillBeRawPtr<MediaQueryList> matchMedia(const String&);
|
| + PassRefPtrWillBeRawPtr<MediaQueryList> matchMedia(const String&);
|
|
|
| - unsigned pendingUnloadEventListeners() const;
|
| + unsigned pendingUnloadEventListeners() const;
|
|
|
| - static FloatRect adjustWindowRect(LocalFrame&, const FloatRect& pendingChanges);
|
| + static FloatRect adjustWindowRect(LocalFrame&, const FloatRect& pendingChanges);
|
|
|
| - bool allowPopUp(); // Call on first window, not target window.
|
| - static bool allowPopUp(LocalFrame& firstFrame);
|
| - static bool canShowModalDialogNow(const LocalFrame*);
|
| + bool allowPopUp(); // Call on first window, not target window.
|
| + static bool allowPopUp(LocalFrame& firstFrame);
|
| + static bool canShowModalDialogNow(const LocalFrame*);
|
|
|
| - // DOM Level 0
|
| + // DOM Level 0
|
|
|
| - Screen& screen() const;
|
| - History& history() const;
|
| - BarProp& locationbar() const;
|
| - BarProp& menubar() const;
|
| - BarProp& personalbar() const;
|
| - BarProp& scrollbars() const;
|
| - BarProp& statusbar() const;
|
| - BarProp& toolbar() const;
|
| - Navigator& navigator() const;
|
| - Navigator& clientInformation() const { return navigator(); }
|
| + Screen& screen() const;
|
| + History& history() const;
|
| + BarProp& locationbar() const;
|
| + BarProp& menubar() const;
|
| + BarProp& personalbar() const;
|
| + BarProp& scrollbars() const;
|
| + BarProp& statusbar() const;
|
| + BarProp& toolbar() const;
|
| + Navigator& navigator() const;
|
| + Navigator& clientInformation() const { return navigator(); }
|
|
|
| - Location& location() const;
|
| - void setLocation(const String& location, LocalDOMWindow* callingWindow, LocalDOMWindow* enteredWindow,
|
| - SetLocationLocking = LockHistoryBasedOnGestureState);
|
| + Location& location() const;
|
| + void setLocation(const String& location, LocalDOMWindow* callingWindow, LocalDOMWindow* enteredWindow,
|
| + SetLocationLocking = LockHistoryBasedOnGestureState);
|
|
|
| - DOMSelection* getSelection();
|
| + DOMSelection* getSelection();
|
|
|
| - Element* frameElement() const;
|
| + Element* frameElement() const;
|
|
|
| - void focus(ExecutionContext* = 0);
|
| - void blur();
|
| - void close(ExecutionContext* = 0);
|
| - void print();
|
| - void stop();
|
| + void focus(ExecutionContext* = 0);
|
| + void blur();
|
| + void close(ExecutionContext* = 0);
|
| + void print();
|
| + void stop();
|
|
|
| - PassRefPtrWillBeRawPtr<LocalDOMWindow> open(const String& urlString, const AtomicString& frameName, const String& windowFeaturesString,
|
| - LocalDOMWindow* callingWindow, LocalDOMWindow* enteredWindow);
|
| + PassRefPtrWillBeRawPtr<LocalDOMWindow> open(const String& urlString, const AtomicString& frameName, const String& windowFeaturesString,
|
| + LocalDOMWindow* callingWindow, LocalDOMWindow* enteredWindow);
|
|
|
| - typedef void (*PrepareDialogFunction)(LocalDOMWindow*, void* context);
|
| - void showModalDialog(const String& urlString, const String& dialogFeaturesString,
|
| - LocalDOMWindow* callingWindow, LocalDOMWindow* enteredWindow, PrepareDialogFunction, void* functionContext);
|
| + typedef void (*PrepareDialogFunction)(LocalDOMWindow*, void* context);
|
| + void showModalDialog(const String& urlString, const String& dialogFeaturesString,
|
| + LocalDOMWindow* callingWindow, LocalDOMWindow* enteredWindow, PrepareDialogFunction, void* functionContext);
|
|
|
| - void alert(const String& message = String());
|
| - bool confirm(const String& message);
|
| - String prompt(const String& message, const String& defaultValue);
|
| + void alert(const String& message = String());
|
| + bool confirm(const String& message);
|
| + String prompt(const String& message, const String& defaultValue);
|
|
|
| - bool find(const String&, bool caseSensitive, bool backwards, bool wrap, bool wholeWord, bool searchInFrames, bool showDialog) const;
|
| + bool find(const String&, bool caseSensitive, bool backwards, bool wrap, bool wholeWord, bool searchInFrames, bool showDialog) const;
|
|
|
| - bool offscreenBuffering() const;
|
| + bool offscreenBuffering() const;
|
|
|
| - int outerHeight() const;
|
| - int outerWidth() const;
|
| - int innerHeight() const;
|
| - int innerWidth() const;
|
| - int screenX() const;
|
| - int screenY() const;
|
| - int screenLeft() const { return screenX(); }
|
| - int screenTop() const { return screenY(); }
|
| - int scrollX() const;
|
| - int scrollY() const;
|
| - int pageXOffset() const { return scrollX(); }
|
| - int pageYOffset() const { return scrollY(); }
|
| + int outerHeight() const;
|
| + int outerWidth() const;
|
| + int innerHeight() const;
|
| + int innerWidth() const;
|
| + int screenX() const;
|
| + int screenY() const;
|
| + int screenLeft() const { return screenX(); }
|
| + int screenTop() const { return screenY(); }
|
| + int scrollX() const;
|
| + int scrollY() const;
|
| + int pageXOffset() const { return scrollX(); }
|
| + int pageYOffset() const { return scrollY(); }
|
|
|
| - bool closed() const;
|
| + bool closed() const;
|
|
|
| - unsigned length() const;
|
| + unsigned length() const;
|
|
|
| - const AtomicString& name() const;
|
| - void setName(const AtomicString&);
|
| + const AtomicString& name() const;
|
| + void setName(const AtomicString&);
|
|
|
| - String status() const;
|
| - void setStatus(const String&);
|
| - String defaultStatus() const;
|
| - void setDefaultStatus(const String&);
|
| + String status() const;
|
| + void setStatus(const String&);
|
| + String defaultStatus() const;
|
| + void setDefaultStatus(const String&);
|
|
|
| - // Self-referential attributes
|
| + // Self-referential attributes
|
|
|
| - LocalDOMWindow* self() const;
|
| - LocalDOMWindow* window() const { return self(); }
|
| - LocalDOMWindow* frames() const { return self(); }
|
| + LocalDOMWindow* self() const;
|
| + LocalDOMWindow* window() const { return self(); }
|
| + LocalDOMWindow* frames() const { return self(); }
|
|
|
| - LocalDOMWindow* opener() const;
|
| - LocalDOMWindow* parent() const;
|
| - LocalDOMWindow* top() const;
|
| + LocalDOMWindow* opener() const;
|
| + LocalDOMWindow* parent() const;
|
| + LocalDOMWindow* top() const;
|
|
|
| - // DOM Level 2 AbstractView Interface
|
| + // DOM Level 2 AbstractView Interface
|
|
|
| - Document* document() const;
|
| + Document* document() const;
|
|
|
| - // CSSOM View Module
|
| + // CSSOM View Module
|
|
|
| - StyleMedia& styleMedia() const;
|
| + StyleMedia& styleMedia() const;
|
|
|
| - // DOM Level 2 Style Interface
|
| + // DOM Level 2 Style Interface
|
|
|
| - PassRefPtrWillBeRawPtr<CSSStyleDeclaration> getComputedStyle(Element*, const String& pseudoElt) const;
|
| + PassRefPtrWillBeRawPtr<CSSStyleDeclaration> getComputedStyle(Element*, const String& pseudoElt) const;
|
|
|
| - // WebKit extensions
|
| + // WebKit extensions
|
|
|
| - PassRefPtrWillBeRawPtr<CSSRuleList> getMatchedCSSRules(Element*, const String& pseudoElt) const;
|
| - double devicePixelRatio() const;
|
| + PassRefPtrWillBeRawPtr<CSSRuleList> getMatchedCSSRules(Element*, const String& pseudoElt) const;
|
| + double devicePixelRatio() const;
|
|
|
| - Console& console() const;
|
| - FrameConsole* frameConsole() const;
|
| + Console& console() const;
|
| + FrameConsole* frameConsole() const;
|
|
|
| - void printErrorMessage(const String&);
|
| - String crossDomainAccessErrorMessage(LocalDOMWindow* callingWindow);
|
| - String sanitizedCrossDomainAccessErrorMessage(LocalDOMWindow* callingWindow);
|
| + void printErrorMessage(const String&);
|
| + String crossDomainAccessErrorMessage(LocalDOMWindow* callingWindow);
|
| + String sanitizedCrossDomainAccessErrorMessage(LocalDOMWindow* callingWindow);
|
|
|
| - void postMessage(PassRefPtr<SerializedScriptValue> message, const MessagePortArray*, const String& targetOrigin, LocalDOMWindow* source, ExceptionState&);
|
| - void postMessageTimerFired(PostMessageTimer*);
|
| - void dispatchMessageEventWithOriginCheck(SecurityOrigin* intendedTargetOrigin, PassRefPtrWillBeRawPtr<Event>, PassRefPtrWillBeRawPtr<ScriptCallStack>);
|
| + void postMessage(PassRefPtr<SerializedScriptValue> message, const MessagePortArray*, const String& targetOrigin, LocalDOMWindow* source, ExceptionState&);
|
| + void postMessageTimerFired(PostMessageTimer*);
|
| + void dispatchMessageEventWithOriginCheck(SecurityOrigin* intendedTargetOrigin, PassRefPtrWillBeRawPtr<Event>, PassRefPtrWillBeRawPtr<ScriptCallStack>);
|
|
|
| - void scrollBy(int x, int y, ScrollBehavior = ScrollBehaviorAuto) const;
|
| - void scrollBy(int x, int y, const Dictionary& scrollOptions, ExceptionState&) const;
|
| - void scrollTo(int x, int y, ScrollBehavior = ScrollBehaviorAuto) const;
|
| - void scrollTo(int x, int y, const Dictionary& scrollOptions, ExceptionState&) const;
|
| - void scroll(int x, int y) const { scrollTo(x, y); }
|
| - void scroll(int x, int y, const Dictionary& scrollOptions, ExceptionState& exceptionState) const { scrollTo(x, y, scrollOptions, exceptionState); }
|
| + void scrollBy(int x, int y, ScrollBehavior = ScrollBehaviorAuto) const;
|
| + void scrollBy(int x, int y, const Dictionary& scrollOptions, ExceptionState&) const;
|
| + void scrollTo(int x, int y, ScrollBehavior = ScrollBehaviorAuto) const;
|
| + void scrollTo(int x, int y, const Dictionary& scrollOptions, ExceptionState&) const;
|
| + void scroll(int x, int y) const { scrollTo(x, y); }
|
| + void scroll(int x, int y, const Dictionary& scrollOptions, ExceptionState& exceptionState) const { scrollTo(x, y, scrollOptions, exceptionState); }
|
|
|
| - void moveBy(float x, float y) const;
|
| - void moveTo(float x, float y) const;
|
| + void moveBy(float x, float y) const;
|
| + void moveTo(float x, float y) const;
|
|
|
| - void resizeBy(float x, float y) const;
|
| - void resizeTo(float width, float height) const;
|
| + void resizeBy(float x, float y) const;
|
| + void resizeTo(float width, float height) const;
|
|
|
| - // WebKit animation extensions
|
| - int requestAnimationFrame(PassOwnPtrWillBeRawPtr<RequestAnimationFrameCallback>);
|
| - int webkitRequestAnimationFrame(PassOwnPtrWillBeRawPtr<RequestAnimationFrameCallback>);
|
| - void cancelAnimationFrame(int id);
|
| + // WebKit animation extensions
|
| + int requestAnimationFrame(PassOwnPtrWillBeRawPtr<RequestAnimationFrameCallback>);
|
| + int webkitRequestAnimationFrame(PassOwnPtrWillBeRawPtr<RequestAnimationFrameCallback>);
|
| + void cancelAnimationFrame(int id);
|
|
|
| - DOMWindowCSS& css() const;
|
| + DOMWindowCSS& css() const;
|
|
|
| - // Events
|
| - // EventTarget API
|
| - virtual bool addEventListener(const AtomicString& eventType, PassRefPtr<EventListener>, bool useCapture = false) OVERRIDE;
|
| - virtual bool removeEventListener(const AtomicString& eventType, PassRefPtr<EventListener>, bool useCapture = false) OVERRIDE;
|
| - virtual void removeAllEventListeners() OVERRIDE;
|
| + // Events
|
| + // EventTarget API
|
| + virtual bool addEventListener(const AtomicString& eventType, PassRefPtr<EventListener>, bool useCapture = false) OVERRIDE;
|
| + virtual bool removeEventListener(const AtomicString& eventType, PassRefPtr<EventListener>, bool useCapture = false) OVERRIDE;
|
| + virtual void removeAllEventListeners() OVERRIDE;
|
|
|
| - using EventTarget::dispatchEvent;
|
| - bool dispatchEvent(PassRefPtrWillBeRawPtr<Event> prpEvent, PassRefPtrWillBeRawPtr<EventTarget> prpTarget);
|
| + using EventTarget::dispatchEvent;
|
| + bool dispatchEvent(PassRefPtrWillBeRawPtr<Event> prpEvent, PassRefPtrWillBeRawPtr<EventTarget> prpTarget);
|
|
|
| - void dispatchLoadEvent();
|
| + void dispatchLoadEvent();
|
|
|
| - DEFINE_ATTRIBUTE_EVENT_LISTENER(animationend);
|
| - DEFINE_ATTRIBUTE_EVENT_LISTENER(animationiteration);
|
| - DEFINE_ATTRIBUTE_EVENT_LISTENER(animationstart);
|
| - DEFINE_ATTRIBUTE_EVENT_LISTENER(search);
|
| - DEFINE_ATTRIBUTE_EVENT_LISTENER(transitionend);
|
| - DEFINE_ATTRIBUTE_EVENT_LISTENER(wheel);
|
| + DEFINE_ATTRIBUTE_EVENT_LISTENER(animationend);
|
| + DEFINE_ATTRIBUTE_EVENT_LISTENER(animationiteration);
|
| + DEFINE_ATTRIBUTE_EVENT_LISTENER(animationstart);
|
| + DEFINE_ATTRIBUTE_EVENT_LISTENER(search);
|
| + DEFINE_ATTRIBUTE_EVENT_LISTENER(transitionend);
|
| + DEFINE_ATTRIBUTE_EVENT_LISTENER(wheel);
|
|
|
| - DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(webkitanimationstart, webkitAnimationStart);
|
| - DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(webkitanimationiteration, webkitAnimationIteration);
|
| - DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(webkitanimationend, webkitAnimationEnd);
|
| - DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(webkittransitionend, webkitTransitionEnd);
|
| + DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(webkitanimationstart, webkitAnimationStart);
|
| + DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(webkitanimationiteration, webkitAnimationIteration);
|
| + DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(webkitanimationend, webkitAnimationEnd);
|
| + DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(webkittransitionend, webkitTransitionEnd);
|
|
|
| - void captureEvents() { }
|
| - void releaseEvents() { }
|
| + void captureEvents() { }
|
| + void releaseEvents() { }
|
|
|
| - void finishedLoading();
|
| + void finishedLoading();
|
|
|
| - // HTML 5 key/value storage
|
| - Storage* sessionStorage(ExceptionState&) const;
|
| - Storage* localStorage(ExceptionState&) const;
|
| - Storage* optionalSessionStorage() const { return m_sessionStorage.get(); }
|
| - Storage* optionalLocalStorage() const { return m_localStorage.get(); }
|
| + // HTML 5 key/value storage
|
| + Storage* sessionStorage(ExceptionState&) const;
|
| + Storage* localStorage(ExceptionState&) const;
|
| + Storage* optionalSessionStorage() const { return m_sessionStorage.get(); }
|
| + Storage* optionalLocalStorage() const { return m_localStorage.get(); }
|
|
|
| - ApplicationCache* applicationCache() const;
|
| - ApplicationCache* optionalApplicationCache() const { return m_applicationCache.get(); }
|
| + ApplicationCache* applicationCache() const;
|
| + ApplicationCache* optionalApplicationCache() const { return m_applicationCache.get(); }
|
|
|
| - // This is the interface orientation in degrees. Some examples are:
|
| - // 0 is straight up; -90 is when the device is rotated 90 clockwise;
|
| - // 90 is when rotated counter clockwise.
|
| - int orientation() const;
|
| + // This is the interface orientation in degrees. Some examples are:
|
| + // 0 is straight up; -90 is when the device is rotated 90 clockwise;
|
| + // 90 is when rotated counter clockwise.
|
| + int orientation() const;
|
|
|
| - DEFINE_ATTRIBUTE_EVENT_LISTENER(orientationchange);
|
| - DEFINE_ATTRIBUTE_EVENT_LISTENER(touchstart);
|
| - DEFINE_ATTRIBUTE_EVENT_LISTENER(touchmove);
|
| - DEFINE_ATTRIBUTE_EVENT_LISTENER(touchend);
|
| - DEFINE_ATTRIBUTE_EVENT_LISTENER(touchcancel);
|
| + DEFINE_ATTRIBUTE_EVENT_LISTENER(orientationchange);
|
| + DEFINE_ATTRIBUTE_EVENT_LISTENER(touchstart);
|
| + DEFINE_ATTRIBUTE_EVENT_LISTENER(touchmove);
|
| + DEFINE_ATTRIBUTE_EVENT_LISTENER(touchend);
|
| + DEFINE_ATTRIBUTE_EVENT_LISTENER(touchcancel);
|
|
|
| - Performance& performance() const;
|
| + Performance& performance() const;
|
|
|
| - // FIXME: When this LocalDOMWindow is no longer the active LocalDOMWindow (i.e.,
|
| - // when its document is no longer the document that is displayed in its
|
| - // frame), we would like to zero out m_frame to avoid being confused
|
| - // by the document that is currently active in m_frame.
|
| - bool isCurrentlyDisplayedInFrame() const;
|
| + // FIXME: When this LocalDOMWindow is no longer the active LocalDOMWindow (i.e.,
|
| + // when its document is no longer the document that is displayed in its
|
| + // frame), we would like to zero out m_frame to avoid being confused
|
| + // by the document that is currently active in m_frame.
|
| + bool isCurrentlyDisplayedInFrame() const;
|
|
|
| - void willDetachDocumentFromFrame();
|
| - LocalDOMWindow* anonymousIndexedGetter(uint32_t);
|
| + void willDetachDocumentFromFrame();
|
| + LocalDOMWindow* anonymousIndexedGetter(uint32_t);
|
|
|
| - bool isInsecureScriptAccess(LocalDOMWindow& callingWindow, const String& urlString);
|
| + bool isInsecureScriptAccess(LocalDOMWindow& callingWindow, const String& urlString);
|
|
|
| - PassOwnPtr<LifecycleNotifier<LocalDOMWindow> > createLifecycleNotifier();
|
| + PassOwnPtr<LifecycleNotifier<LocalDOMWindow> > createLifecycleNotifier();
|
|
|
| - EventQueue* eventQueue() const;
|
| - void enqueueWindowEvent(PassRefPtrWillBeRawPtr<Event>);
|
| - void enqueueDocumentEvent(PassRefPtrWillBeRawPtr<Event>);
|
| - void enqueuePageshowEvent(PageshowEventPersistence);
|
| - void enqueueHashchangeEvent(const String& oldURL, const String& newURL);
|
| - void enqueuePopstateEvent(PassRefPtr<SerializedScriptValue>);
|
| - void dispatchWindowLoadEvent();
|
| - void documentWasClosed();
|
| - void statePopped(PassRefPtr<SerializedScriptValue>);
|
| + EventQueue* eventQueue() const;
|
| + void enqueueWindowEvent(PassRefPtrWillBeRawPtr<Event>);
|
| + void enqueueDocumentEvent(PassRefPtrWillBeRawPtr<Event>);
|
| + void enqueuePageshowEvent(PageshowEventPersistence);
|
| + void enqueueHashchangeEvent(const String& oldURL, const String& newURL);
|
| + void enqueuePopstateEvent(PassRefPtr<SerializedScriptValue>);
|
| + void dispatchWindowLoadEvent();
|
| + void documentWasClosed();
|
| + void statePopped(PassRefPtr<SerializedScriptValue>);
|
|
|
| - // FIXME: This shouldn't be public once LocalDOMWindow becomes ExecutionContext.
|
| - void clearEventQueue();
|
| + // FIXME: This shouldn't be public once LocalDOMWindow becomes ExecutionContext.
|
| + void clearEventQueue();
|
|
|
| - void acceptLanguagesChanged();
|
| + void acceptLanguagesChanged();
|
|
|
| - virtual void trace(Visitor*) OVERRIDE;
|
| + virtual void trace(Visitor*) OVERRIDE;
|
|
|
| - protected:
|
| - DOMWindowLifecycleNotifier& lifecycleNotifier();
|
| +protected:
|
| + DOMWindowLifecycleNotifier& lifecycleNotifier();
|
|
|
| - private:
|
| - explicit LocalDOMWindow(LocalFrame&);
|
| +private:
|
| + explicit LocalDOMWindow(LocalFrame&);
|
|
|
| - Page* page();
|
| + Page* page();
|
|
|
| - virtual void frameDestroyed() OVERRIDE;
|
| - virtual void willDetachFrameHost() OVERRIDE;
|
| + virtual void frameDestroyed() OVERRIDE;
|
| + virtual void willDetachFrameHost() OVERRIDE;
|
|
|
| - void clearDocument();
|
| - void resetDOMWindowProperties();
|
| - void willDestroyDocumentInFrame();
|
| + void clearDocument();
|
| + void resetDOMWindowProperties();
|
| + void willDestroyDocumentInFrame();
|
|
|
| - // FIXME: Oilpan: the need for this internal method will fall
|
| - // away when EventTargets are no longer using refcounts and
|
| - // window properties are also on the heap. Inline the minimal
|
| - // do-not-broadcast handling then and remove the enum +
|
| - // removeAllEventListenersInternal().
|
| - enum BroadcastListenerRemoval {
|
| - DoNotBroadcastListenerRemoval,
|
| - DoBroadcastListenerRemoval
|
| - };
|
| + // FIXME: Oilpan: the need for this internal method will fall
|
| + // away when EventTargets are no longer using refcounts and
|
| + // window properties are also on the heap. Inline the minimal
|
| + // do-not-broadcast handling then and remove the enum +
|
| + // removeAllEventListenersInternal().
|
| + enum BroadcastListenerRemoval {
|
| + DoNotBroadcastListenerRemoval,
|
| + DoBroadcastListenerRemoval
|
| + };
|
|
|
| - void removeAllEventListenersInternal(BroadcastListenerRemoval);
|
| + void removeAllEventListenersInternal(BroadcastListenerRemoval);
|
|
|
| - RefPtrWillBeMember<Document> m_document;
|
| + RefPtrWillBeMember<Document> m_document;
|
|
|
| - bool m_shouldPrintWhenFinishedLoading;
|
| + bool m_shouldPrintWhenFinishedLoading;
|
| #if ENABLE(ASSERT)
|
| - bool m_hasBeenReset;
|
| + bool m_hasBeenReset;
|
| #endif
|
|
|
| - HashSet<DOMWindowProperty*> m_properties;
|
| + HashSet<DOMWindowProperty*> m_properties;
|
|
|
| - mutable RefPtrWillBeMember<Screen> m_screen;
|
| - mutable RefPtrWillBeMember<History> m_history;
|
| - mutable RefPtrWillBeMember<BarProp> m_locationbar;
|
| - mutable RefPtrWillBeMember<BarProp> m_menubar;
|
| - mutable RefPtrWillBeMember<BarProp> m_personalbar;
|
| - mutable RefPtrWillBeMember<BarProp> m_scrollbars;
|
| - mutable RefPtrWillBeMember<BarProp> m_statusbar;
|
| - mutable RefPtrWillBeMember<BarProp> m_toolbar;
|
| - mutable RefPtrWillBeMember<Console> m_console;
|
| - mutable RefPtrWillBeMember<Navigator> m_navigator;
|
| - mutable RefPtrWillBeMember<Location> m_location;
|
| - mutable RefPtrWillBeMember<StyleMedia> m_media;
|
| + mutable RefPtrWillBeMember<Screen> m_screen;
|
| + mutable RefPtrWillBeMember<History> m_history;
|
| + mutable RefPtrWillBeMember<BarProp> m_locationbar;
|
| + mutable RefPtrWillBeMember<BarProp> m_menubar;
|
| + mutable RefPtrWillBeMember<BarProp> m_personalbar;
|
| + mutable RefPtrWillBeMember<BarProp> m_scrollbars;
|
| + mutable RefPtrWillBeMember<BarProp> m_statusbar;
|
| + mutable RefPtrWillBeMember<BarProp> m_toolbar;
|
| + mutable RefPtrWillBeMember<Console> m_console;
|
| + mutable RefPtrWillBeMember<Navigator> m_navigator;
|
| + mutable RefPtrWillBeMember<Location> m_location;
|
| + mutable RefPtrWillBeMember<StyleMedia> m_media;
|
|
|
| - String m_status;
|
| - String m_defaultStatus;
|
| + String m_status;
|
| + String m_defaultStatus;
|
|
|
| - mutable RefPtrWillBeMember<Storage> m_sessionStorage;
|
| - mutable RefPtrWillBeMember<Storage> m_localStorage;
|
| - mutable RefPtrWillBeMember<ApplicationCache> m_applicationCache;
|
| + mutable RefPtrWillBeMember<Storage> m_sessionStorage;
|
| + mutable RefPtrWillBeMember<Storage> m_localStorage;
|
| + mutable RefPtrWillBeMember<ApplicationCache> m_applicationCache;
|
|
|
| - mutable RefPtrWillBeMember<Performance> m_performance;
|
| + mutable RefPtrWillBeMember<Performance> m_performance;
|
|
|
| - mutable RefPtrWillBeMember<DOMWindowCSS> m_css;
|
| + mutable RefPtrWillBeMember<DOMWindowCSS> m_css;
|
|
|
| - RefPtrWillBeMember<DOMWindowEventQueue> m_eventQueue;
|
| - RefPtr<SerializedScriptValue> m_pendingStateObject;
|
| + RefPtrWillBeMember<DOMWindowEventQueue> m_eventQueue;
|
| + RefPtr<SerializedScriptValue> m_pendingStateObject;
|
|
|
| - HashSet<OwnPtr<PostMessageTimer> > m_postMessageTimers;
|
| - };
|
| + HashSet<OwnPtr<PostMessageTimer> > m_postMessageTimers;
|
| +};
|
|
|
| - inline String LocalDOMWindow::status() const
|
| - {
|
| - return m_status;
|
| - }
|
| +inline String LocalDOMWindow::status() const
|
| +{
|
| + return m_status;
|
| +}
|
|
|
| - inline String LocalDOMWindow::defaultStatus() const
|
| - {
|
| - return m_defaultStatus;
|
| - }
|
| +inline String LocalDOMWindow::defaultStatus() const
|
| +{
|
| + return m_defaultStatus;
|
| +}
|
|
|
| } // namespace blink
|
|
|
| -#endif // DOMWindow_h
|
| +#endif // LocalDOMWindow_h
|
|
|