Changeset 64092 in webkit

Timestamp:

Jul 26, 2010 5:01:07 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-07-26 Dominic Mazzoni <​dmazzoni@google.com>

Reviewed by Chris Fleizach.

Add accessor to get the doctype of a WebDocument, needed to
implement Windows accessibility.

​https://bugs.webkit.org/show_bug.cgi?id=43003

• WebKit.gyp:
• public/WebDocument.h:
• public/WebDocumentType.h: Added. (WebKit::WebDocumentType::WebDocumentType): (WebKit::WebDocumentType::operator=): (WebKit::WebDocumentType::assign):
• src/WebDocument.cpp: (WebKit::WebDocument::doctype):
• src/WebDocumentType.cpp: Added. (WebKit::WebDocumentType::name): (WebKit::WebDocumentType::WebDocumentType): (WebKit::WebDocumentType::operator=): (WebKit::WebDocumentType::operator PassRefPtr<DocumentType>):

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• WebKit.gyp (modified) (2 diffs)
• public/WebDocument.h (modified) (2 diffs)
• public/WebDocumentType.h (copied) (copied from trunk/WebKit/chromium/public/WebDocument.h) (2 diffs)
• src/WebDocument.cpp (modified) (3 diffs)
• src/WebDocumentType.cpp (added)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-07-26  Dominic Mazzoni  <dmazzoni@google.com>
+
+        Reviewed by Chris Fleizach.
+
+        Add accessor to get the doctype of a WebDocument, needed to
+        implement Windows accessibility.
+
+        https://bugs.webkit.org/show_bug.cgi?id=43003
+        
+        * WebKit.gyp:
+        * public/WebDocument.h:
+        * public/WebDocumentType.h: Added.
+        (WebKit::WebDocumentType::WebDocumentType):
+        (WebKit::WebDocumentType::operator=):
+        (WebKit::WebDocumentType::assign):
+        * src/WebDocument.cpp:
+        (WebKit::WebDocument::doctype):
+        * src/WebDocumentType.cpp: Added.
+        (WebKit::WebDocumentType::name):
+        (WebKit::WebDocumentType::WebDocumentType):
+        (WebKit::WebDocumentType::operator=):
+        (WebKit::WebDocumentType::operator PassRefPtr<DocumentType>):
+
 2010-07-26  Satish Sampath  <satish@chromium.org>
 

trunk/WebKit/chromium/WebKit.gyp

@@ -145 +145 @@
                 'public/WebDevToolsMessageTransport.h',
                 'public/WebDocument.h',
+                'public/WebDocumentType.h',
                 'public/WebDragData.h',
                 'public/WebEditingAction.h',
@@ -376 +377 @@
                 'src/WebDevToolsFrontendImpl.h',
                 'src/WebDocument.cpp',
+                'src/WebDocumentType.cpp',
                 'src/WebDragData.cpp',
                 'src/WebElement.cpp',

trunk/WebKit/chromium/public/WebDocument.h

@@ -35 +35 @@
 
 #if WEBKIT_IMPLEMENTATION
-namespace WebCore { class Document; }
+namespace WebCore {
+class Document;
+class DocumentType;
+}
 namespace WTF { template <typename T> class PassRefPtr; }
 #endif
 
 namespace WebKit {
+class WebDocumentType;
 class WebElement;
 class WebFrame;
@@ -75 +79 @@
     WEBKIT_API WebElement getElementById(const WebString&) const;
     WEBKIT_API WebNode focusedNode() const;
+    WEBKIT_API WebDocumentType doctype() const;
 
 #if WEBKIT_IMPLEMENTATION

trunk/WebKit/chromium/public/WebDocumentType.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2009 Google Inc. All rights reserved.
+ * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29 +29 @@
  */
 
-#ifndef WebDocument_h
-#define WebDocument_h
+#ifndef WebDocumentType_h
+#define WebDocumentType_h
 
 #include "WebNode.h"
 
 #if WEBKIT_IMPLEMENTATION
-namespace WebCore { class Document; }
+namespace WebCore { class DocumentType; }
 namespace WTF { template <typename T> class PassRefPtr; }
 #endif
 
 namespace WebKit {
-class WebElement;
-class WebFrame;
-class WebNodeCollection;
-class WebNodeList;
 class WebString;
-class WebURL;
 
-// Provides readonly access to some properties of a DOM document.
-class WebDocument : public WebNode {
+// Provides readonly access to some properties of a DOM document type.
+class WebDocumentType : public WebNode {
 public:
-    WebDocument() { }
-    WebDocument(const WebDocument& e) : WebNode(e) { }
+    WebDocumentType() { }
+    WebDocumentType(const WebDocumentType& e) : WebNode(e) { }
 
-    WebDocument& operator=(const WebDocument& e)
+    WebDocumentType& operator=(const WebDocumentType& e)
     {
         WebNode::assign(e);
         return *this;
     }
-    void assign(const WebDocument& e) { WebNode::assign(e); }
+    void assign(const WebDocumentType& e) { WebNode::assign(e); }
 
-    // Returns the frame the document belongs to or 0 if the document is frameless.
-    WEBKIT_API WebFrame* frame() const;
-    WEBKIT_API bool isHTMLDocument() const;
-    WEBKIT_API bool isXHTMLDocument() const;
-    WEBKIT_API bool isPluginDocument() const;
-    WEBKIT_API WebURL baseURL() const;
-    WEBKIT_API WebURL firstPartyForCookies() const;
-    WEBKIT_API WebElement documentElement() const;
-    WEBKIT_API WebElement body() const;
-    WEBKIT_API WebElement head();
-    WEBKIT_API WebString title() const;
-    WEBKIT_API WebNodeCollection all();
-    WEBKIT_API WebURL completeURL(const WebString&) const;
-    WEBKIT_API WebElement getElementById(const WebString&) const;
-    WEBKIT_API WebNode focusedNode() const;
+    WEBKIT_API WebString name() const;
 
 #if WEBKIT_IMPLEMENTATION
-    WebDocument(const WTF::PassRefPtr<WebCore::Document>&);
-    WebDocument& operator=(const WTF::PassRefPtr<WebCore::Document>&);
-    operator WTF::PassRefPtr<WebCore::Document>() const;
+    WebDocumentType(const WTF::PassRefPtr<WebCore::DocumentType>&);
+    WebDocumentType& operator=(const WTF::PassRefPtr<WebCore::DocumentType>&);
+    operator WTF::PassRefPtr<WebCore::DocumentType>() const;
 #endif
 };

trunk/WebKit/chromium/src/WebDocument.cpp

@@ -33 +33 @@
 
 #include "Document.h"
+#include "DocumentType.h"
 #include "Element.h"
 #include "HTMLAllCollection.h"
@@ -41 +42 @@
 #include "NodeList.h"
 
+#include "WebDocumentType.h"
 #include "WebElement.h"
 #include "WebFrameImpl.h"
@@ -123 +125 @@
 }
 
+WebDocumentType WebDocument::doctype() const
+{
+    return WebDocumentType(constUnwrap<Document>()->doctype());
+}
+
 WebDocument::WebDocument(const PassRefPtr<Document>& elem)
     : WebNode(elem)