From d441d6f39bb846989d95bcf5caf387b42414718d Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 13 Sep 2013 12:51:20 +0200 Subject: Import Qt5x2 branch of QtWebkit for Qt 5.2 Importing a new snapshot of webkit. Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c Reviewed-by: Allan Sandfeld Jensen --- Source/WebCore/page/DOMWindow.h | 52 +++++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 18 deletions(-) (limited to 'Source/WebCore/page/DOMWindow.h') diff --git a/Source/WebCore/page/DOMWindow.h b/Source/WebCore/page/DOMWindow.h index 79029d08b..38f07828f 100644 --- a/Source/WebCore/page/DOMWindow.h +++ b/Source/WebCore/page/DOMWindow.h @@ -35,7 +35,7 @@ namespace WebCore { - class BarInfo; + class BarProp; class CSSRuleList; class CSSStyleDeclaration; class Console; @@ -59,6 +59,7 @@ namespace WebCore { class Navigator; class Node; class Page; + class PageConsole; class Performance; class PostMessageTimer; class ScheduledAction; @@ -69,6 +70,7 @@ namespace WebCore { class Storage; class StyleMedia; class WebKitPoint; + class DOMWindowCSS; #if ENABLE(REQUEST_ANIMATION_FRAME) class RequestAnimationFrameCallback; @@ -122,9 +124,6 @@ namespace WebCore { static FloatRect adjustWindowRect(Page*, const FloatRect& pendingChanges); - // FIXME: We can remove this function once V8 showModalDialog is changed to use DOMWindow. - static void parseModalDialogFeatures(const String&, HashMap&); - bool allowPopUp(); // Call on first window, not target window. static bool allowPopUp(Frame* firstFrame); static bool canShowModalDialog(const Frame*); @@ -135,12 +134,12 @@ namespace WebCore { Screen* screen() const; History* history() const; Crypto* crypto() const; - BarInfo* locationbar() const; - BarInfo* menubar() const; - BarInfo* personalbar() const; - BarInfo* scrollbars() const; - BarInfo* statusbar() const; - BarInfo* toolbar() 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(); } @@ -235,12 +234,13 @@ namespace WebCore { PassRefPtr webkitConvertPointFromNodeToPage(Node*, const WebKitPoint*) const; Console* console() const; + PageConsole* pageConsole() const; void printErrorMessage(const String&); String crossDomainAccessErrorMessage(DOMWindow* activeWindow); void postMessage(PassRefPtr message, const MessagePortArray*, const String& targetOrigin, DOMWindow* source, ExceptionCode&); - // FIXME: remove this when we update the ObjC bindings (bug #28774). + // Needed for Objective-C bindings (see bug 28774). void postMessage(PassRefPtr message, MessagePort*, const String& targetOrigin, DOMWindow* source, ExceptionCode&); void postMessageTimerFired(PassOwnPtr); void dispatchMessageEventWithOriginCheck(SecurityOrigin* intendedTargetOrigin, PassRefPtr, PassRefPtr); @@ -268,6 +268,10 @@ namespace WebCore { void cancelAnimationFrame(int id); #endif +#if ENABLE(CSS3_CONDITIONAL_RULES) + DOMWindowCSS* css(); +#endif + // Events // EventTarget API virtual bool addEventListener(const AtomicString& eventType, PassRefPtr, bool useCapture); @@ -276,6 +280,7 @@ namespace WebCore { using EventTarget::dispatchEvent; bool dispatchEvent(PassRefPtr prpEvent, PassRefPtr prpTarget); + void dispatchLoadEvent(); DEFINE_ATTRIBUTE_EVENT_LISTENER(abort); @@ -311,6 +316,8 @@ namespace WebCore { DEFINE_ATTRIBUTE_EVENT_LISTENER(loadstart); DEFINE_ATTRIBUTE_EVENT_LISTENER(message); DEFINE_ATTRIBUTE_EVENT_LISTENER(mousedown); + DEFINE_ATTRIBUTE_EVENT_LISTENER(mouseenter); + DEFINE_ATTRIBUTE_EVENT_LISTENER(mouseleave); DEFINE_ATTRIBUTE_EVENT_LISTENER(mousemove); DEFINE_ATTRIBUTE_EVENT_LISTENER(mouseout); DEFINE_ATTRIBUTE_EVENT_LISTENER(mouseover); @@ -348,6 +355,7 @@ namespace WebCore { 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(transitionend, transitionend); void captureEvents(); void releaseEvents(); @@ -404,10 +412,14 @@ namespace WebCore { void willDetachDocumentFromFrame(); void willDestroyCachedFrame(); + void enableSuddenTermination(); + void disableSuddenTermination(); + private: explicit DOMWindow(Document*); Page* page(); + bool allowedToChangeWindowGeometry() const; virtual void frameDestroyed() OVERRIDE; virtual void willDetachPage() OVERRIDE; @@ -417,7 +429,7 @@ namespace WebCore { virtual EventTargetData* eventTargetData(); virtual EventTargetData* ensureEventTargetData(); - static Frame* createWindow(const String& urlString, const AtomicString& frameName, const WindowFeatures&, + static PassRefPtr createWindow(const String& urlString, const AtomicString& frameName, const WindowFeatures&, DOMWindow* activeWindow, Frame* firstFrame, Frame* openerFrame, PrepareDialogFunction = 0, void* functionContext = 0); bool isInsecureScriptAccess(DOMWindow* activeWindow, const String& urlString); @@ -435,12 +447,12 @@ namespace WebCore { mutable RefPtr m_screen; mutable RefPtr m_history; mutable RefPtr m_crypto; - mutable RefPtr m_locationbar; - mutable RefPtr m_menubar; - mutable RefPtr m_personalbar; - mutable RefPtr m_scrollbars; - mutable RefPtr m_statusbar; - mutable RefPtr m_toolbar; + mutable RefPtr m_locationbar; + mutable RefPtr m_menubar; + mutable RefPtr m_personalbar; + mutable RefPtr m_scrollbars; + mutable RefPtr m_statusbar; + mutable RefPtr m_toolbar; mutable RefPtr m_console; mutable RefPtr m_navigator; mutable RefPtr m_location; @@ -458,6 +470,10 @@ namespace WebCore { #if ENABLE(WEB_TIMING) mutable RefPtr m_performance; #endif + +#if ENABLE(CSS3_CONDITIONAL_RULES) + mutable RefPtr m_css; +#endif }; inline String DOMWindow::status() const -- cgit v1.2.1