| Index: third_party/WebKit/Source/core/frame/DOMWindow.h
|
| diff --git a/third_party/WebKit/Source/core/frame/DOMWindow.h b/third_party/WebKit/Source/core/frame/DOMWindow.h
|
| index f306e143dca2dd84e2d5122719516ee4c41710e7..dfd491f5e92b85df9c9891727dde2eb126ca5446 100644
|
| --- a/third_party/WebKit/Source/core/frame/DOMWindow.h
|
| +++ b/third_party/WebKit/Source/core/frame/DOMWindow.h
|
| @@ -11,36 +11,16 @@
|
| #include "core/frame/DOMWindowBase64.h"
|
| #include "core/frame/Frame.h"
|
| #include "platform/heap/Handle.h"
|
| -#include "platform/scroll/ScrollableArea.h"
|
| #include "wtf/Assertions.h"
|
| #include "wtf/Forward.h"
|
|
|
| namespace blink {
|
|
|
| -class ApplicationCache;
|
| -class BarProp;
|
| -class CSSRuleList;
|
| -class CSSStyleDeclaration;
|
| -class CustomElementRegistry;
|
| -class DOMSelection;
|
| -class DOMVisualViewport;
|
| class Document;
|
| -class Element;
|
| -class External;
|
| -class FrameRequestCallback;
|
| -class History;
|
| -class IdleRequestCallback;
|
| -class IdleRequestOptions;
|
| class Location;
|
| class LocalDOMWindow;
|
| class MessageEvent;
|
| -class MediaQueryList;
|
| -class Navigator;
|
| -class Screen;
|
| -class ScriptState;
|
| -class ScrollToOptions;
|
| class SerializedScriptValue;
|
| -class StyleMedia;
|
|
|
| class CORE_EXPORT DOMWindow : public EventTargetWithInlineData,
|
| public DOMWindowBase64 {
|
| @@ -75,48 +55,11 @@ class CORE_EXPORT DOMWindow : public EventTargetWithInlineData,
|
| const AtomicString& interfaceName() const override;
|
| const DOMWindow* toDOMWindow() const override;
|
|
|
| - // DOM Level 0
|
| - virtual Screen* screen() const = 0;
|
| - virtual History* history() const = 0;
|
| - virtual BarProp* locationbar() const = 0;
|
| - virtual BarProp* menubar() const = 0;
|
| - virtual BarProp* personalbar() const = 0;
|
| - virtual BarProp* scrollbars() const = 0;
|
| - virtual BarProp* statusbar() const = 0;
|
| - virtual BarProp* toolbar() const = 0;
|
| - virtual Navigator* navigator() const = 0;
|
| - Navigator* clientInformation() const { return navigator(); }
|
| + // Cross-origin DOM Level 0
|
| Location* location() const;
|
| -
|
| - virtual bool offscreenBuffering() const = 0;
|
| -
|
| - virtual int outerHeight() const = 0;
|
| - virtual int outerWidth() const = 0;
|
| - virtual int innerHeight() const = 0;
|
| - virtual int innerWidth() const = 0;
|
| - virtual int screenX() const = 0;
|
| - virtual int screenY() const = 0;
|
| - int screenLeft() const { return screenX(); }
|
| - int screenTop() const { return screenY(); }
|
| - virtual double scrollX() const = 0;
|
| - virtual double scrollY() const = 0;
|
| - double pageXOffset() const { return scrollX(); }
|
| - double pageYOffset() const { return scrollY(); }
|
| -
|
| - virtual DOMVisualViewport* visualViewport() { return nullptr; }
|
| -
|
| bool closed() const;
|
| -
|
| unsigned length() const;
|
|
|
| - virtual const AtomicString& name() const = 0;
|
| - virtual void setName(const AtomicString&) = 0;
|
| -
|
| - virtual String status() const = 0;
|
| - virtual void setStatus(const String&) = 0;
|
| - virtual String defaultStatus() const = 0;
|
| - virtual void setDefaultStatus(const String&) = 0;
|
| -
|
| // Self-referential attributes
|
| DOMWindow* self() const;
|
| DOMWindow* window() const { return self(); }
|
| @@ -126,88 +69,9 @@ class CORE_EXPORT DOMWindow : public EventTargetWithInlineData,
|
| DOMWindow* parent() const;
|
| DOMWindow* top() const;
|
|
|
| - // DOM Level 2 AbstractView Interface
|
| - virtual Document* document() const = 0;
|
| -
|
| - // CSSOM View Module
|
| - virtual StyleMedia* styleMedia() const = 0;
|
| -
|
| - // WebKit extensions
|
| - virtual double devicePixelRatio() const = 0;
|
| -
|
| - virtual ApplicationCache* applicationCache() const = 0;
|
| -
|
| - // 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.
|
| - virtual int orientation() const = 0;
|
| -
|
| - virtual DOMSelection* getSelection() = 0;
|
| -
|
| void focus(ExecutionContext*);
|
| virtual void blur() = 0;
|
| void close(ExecutionContext*);
|
| - virtual void print(ScriptState*) = 0;
|
| - virtual void stop() = 0;
|
| -
|
| - virtual void alert(ScriptState*, const String& message = String()) = 0;
|
| - virtual bool confirm(ScriptState*, const String& message) = 0;
|
| - virtual String prompt(ScriptState*,
|
| - const String& message,
|
| - const String& defaultValue) = 0;
|
| -
|
| - virtual bool find(const String&,
|
| - bool caseSensitive,
|
| - bool backwards,
|
| - bool wrap,
|
| - bool wholeWord,
|
| - bool searchInFrames,
|
| - bool showDialog) const = 0;
|
| -
|
| - virtual void scrollBy(double x,
|
| - double y,
|
| - ScrollBehavior = ScrollBehaviorAuto) const = 0;
|
| - virtual void scrollBy(const ScrollToOptions&) const = 0;
|
| - virtual void scrollTo(double x, double y) const = 0;
|
| - virtual void scrollTo(const ScrollToOptions&) const = 0;
|
| - void scroll(double x, double y) const { scrollTo(x, y); }
|
| - void scroll(const ScrollToOptions& scrollToOptions) const {
|
| - scrollTo(scrollToOptions);
|
| - }
|
| - virtual void moveBy(int x, int y) const = 0;
|
| - virtual void moveTo(int x, int y) const = 0;
|
| -
|
| - virtual void resizeBy(int x, int y) const = 0;
|
| - virtual void resizeTo(int width, int height) const = 0;
|
| -
|
| - virtual MediaQueryList* matchMedia(const String&) = 0;
|
| -
|
| - // DOM Level 2 Style Interface
|
| - virtual CSSStyleDeclaration* getComputedStyle(
|
| - Element*,
|
| - const String& pseudoElt) const = 0;
|
| -
|
| - // WebKit extensions
|
| - virtual CSSRuleList* getMatchedCSSRules(Element*,
|
| - const String& pseudoElt) const = 0;
|
| -
|
| - // WebKit animation extensions
|
| - virtual int requestAnimationFrame(FrameRequestCallback*) = 0;
|
| - virtual int webkitRequestAnimationFrame(FrameRequestCallback*) = 0;
|
| - virtual void cancelAnimationFrame(int id) = 0;
|
| -
|
| - // Idle callback extensions
|
| - virtual int requestIdleCallback(IdleRequestCallback*,
|
| - const IdleRequestOptions&) = 0;
|
| - virtual void cancelIdleCallback(int id) = 0;
|
| -
|
| - // Custom elements
|
| - virtual CustomElementRegistry* customElements(ScriptState*) const = 0;
|
| -
|
| - // Obsolete APIs
|
| - void captureEvents() {}
|
| - void releaseEvents() {}
|
| - External* external();
|
|
|
| // FIXME: This handles both window[index] and window.frames[index]. However,
|
| // the spec exposes window.frames[index] across origins but not
|
| @@ -237,24 +101,6 @@ class CORE_EXPORT DOMWindow : public EventTargetWithInlineData,
|
|
|
| bool isSecureContext() const;
|
|
|
| - 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_ATTRIBUTE_EVENT_LISTENER(orientationchange);
|
| -
|
| protected:
|
| explicit DOMWindow(Frame&);
|
|
|
| @@ -267,7 +113,6 @@ class CORE_EXPORT DOMWindow : public EventTargetWithInlineData,
|
| private:
|
| Member<Frame> m_frame;
|
| mutable Member<Location> m_location;
|
| - Member<External> m_external;
|
|
|
| // Set to true when close() has been called. Needed for
|
| // |window.closed| determinism; having it return 'true'
|
|
|