[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[kevino at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 92d3e532e8cb6f18a15cf90bdcb8d08e7e3aed16
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jan 31 00:37:43 2010 +0000

    Reviewed by Kevin Ollivier.
    
    Add a way to get the parse mode to wxWebKit API.
    
    https://bugs.webkit.org/show_bug.cgi?id=34341
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54105 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
index 1b7e071..1c7adf2 100644
--- a/WebKit/wx/ChangeLog
+++ b/WebKit/wx/ChangeLog
@@ -1,3 +1,18 @@
+2010-01-27  Kevin Watters  <kevinwatters at gmail.com>
+
+        Reviewed by Kevin Ollivier.
+
+        Add a way to get the parse mode to wxWebKit API.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=34341
+
+        * WebFrame.cpp:
+        (wxWebFrame::GetParseMode):
+        * WebFrame.h:
+        * WebView.cpp:
+        (wxWebView::GetParseMode):
+        * WebView.h:
+
 2010-01-22  Kevin Watters  <kevinwatters at gmail.com>
 
         Reviewed by Kevin Ollivier.
diff --git a/WebKit/wx/WebFrame.cpp b/WebKit/wx/WebFrame.cpp
index da32aa3..6cda197 100644
--- a/WebKit/wx/WebFrame.cpp
+++ b/WebKit/wx/WebFrame.cpp
@@ -418,3 +418,11 @@ bool wxWebFrame::ShouldClose() const
 
     return true;
 }
+
+wxWebKitParseMode wxWebFrame::GetParseMode() const
+{
+    if (m_impl->frame && m_impl->frame->document())
+        return (wxWebKitParseMode)m_impl->frame->document()->parseMode();
+
+    return NoDocument;
+}
diff --git a/WebKit/wx/WebFrame.h b/WebKit/wx/WebFrame.h
index e8fc6b6..95a0691 100644
--- a/WebKit/wx/WebFrame.h
+++ b/WebKit/wx/WebFrame.h
@@ -77,6 +77,9 @@ private:
     wxString m_link;
 };
 
+// based on enums in WebCore/dom/Document.h
+enum wxWebKitParseMode { Compat, AlmostStrict, Strict, NoDocument };
+
 class WXDLLIMPEXP_WEBKIT wxWebFrame
 {
     // ChromeClientWx needs to get the Page* stored by the wxWebView
@@ -141,6 +144,8 @@ public:
     
     bool ShouldClose() const;
     
+    wxWebKitParseMode GetParseMode() const;
+    
 private:
     float m_textMagnifier;
     bool m_isEditable;
diff --git a/WebKit/wx/WebView.cpp b/WebKit/wx/WebView.cpp
index d4db9eb..5fdae83 100644
--- a/WebKit/wx/WebView.cpp
+++ b/WebKit/wx/WebView.cpp
@@ -972,3 +972,11 @@ wxWebSettings wxWebView::GetWebSettings()
     
     return wxWebSettings();
 }
+
+wxWebKitParseMode wxWebView::GetParseMode() const
+{
+    if (m_mainFrame)
+        return m_mainFrame->GetParseMode();
+
+    return NoDocument;
+}
\ No newline at end of file
diff --git a/WebKit/wx/WebView.h b/WebKit/wx/WebView.h
index 3f0e987..7d923a3 100644
--- a/WebKit/wx/WebView.h
+++ b/WebKit/wx/WebView.h
@@ -204,6 +204,8 @@ public:
 
     wxWebSettings GetWebSettings();
 
+    wxWebKitParseMode GetParseMode() const;
+
 protected:
 
     // event handlers (these functions should _not_ be virtual)

-- 
WebKit Debian packaging