Merge WebKit at r73109: Initial merge by git.

[android-x86/external-webkit.git] / WebCore / page / DOMWindow.h

diff --git a/WebCore/page/DOMWindow.h b/WebCore/page/DOMWindow.h
index d87a386..68b21ff 100644 (file)
--- a/WebCore/page/DOMWindow.h
+++ b/WebCore/page/DOMWindow.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2006, 2007, 2009 Apple Inc.  All rights reserved.
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -58,10 +59,11 @@ namespace WebCore {
     class History;
     class IDBFactory;
     class Location;
-    class StyleMedia;
+    class MediaQueryList;
     class Navigator;
     class Node;
     class NotificationCenter;
+    class StyleMedia;
 
 #if ENABLE(WEB_TIMING)
     class Performance;
@@ -96,6 +98,8 @@ namespace WebCore {
 
         void clear();
 
+        PassRefPtr<MediaQueryList> matchMedia(const String&);
+
 #if ENABLE(ORIENTATION_EVENTS)
         // This is the interface orientation in degrees. Some examples are:
         //  0 is straight up; -90 is when the device is rotated 90 clockwise;
@@ -275,6 +279,7 @@ namespace WebCore {
         using EventTarget::dispatchEvent;
         bool dispatchEvent(PassRefPtr<Event> prpEvent, PassRefPtr<EventTarget> prpTarget);
         void dispatchLoadEvent();
+        void dispatchTimedEvent(PassRefPtr<Event> event, Document* target, double* startTime, double* endTime);
 
         DEFINE_ATTRIBUTE_EVENT_LISTENER(abort);
         DEFINE_ATTRIBUTE_EVENT_LISTENER(beforeunload);