[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[kevino at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 2d63a7c84e43ecfcb78b29a8b7e3fbaa8cd40579
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 28 22:11:53 2010 +0000

    [wx] Build fix after parseMode -> compatibilityMode rename.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66314 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
index 6efdd42..c111602 100644
--- a/WebKit/wx/ChangeLog
+++ b/WebKit/wx/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-28  Kevin Ollivier  <kevino at theolliviers.com>
+
+        [wx] Build fix after parseMode -> compatibilityMode rename.
+        
+        * WebFrame.cpp:
+        (wxWebFrame::GetCompatibilityMode):
+        * WebFrame.h:
+        * WebView.cpp:
+        (wxWebView::GetCompatibilityMode):
+        * WebView.h:
+
 2010-08-26  Robin Dunn  <robin at alldunn.com>
 
         Reviewed by Kevin Ollivier.
diff --git a/WebKit/wx/WebFrame.cpp b/WebKit/wx/WebFrame.cpp
index da3bfe2..fe45eea 100644
--- a/WebKit/wx/WebFrame.cpp
+++ b/WebKit/wx/WebFrame.cpp
@@ -476,12 +476,12 @@ bool wxWebFrame::ShouldClose() const
     return true;
 }
 
-wxWebKitParseMode wxWebFrame::GetParseMode() const
+wxWebKitCompatibilityMode wxWebFrame::GetCompatibilityMode() const
 {
     if (m_impl->frame && m_impl->frame->document())
-        return (wxWebKitParseMode)m_impl->frame->document()->parseMode();
+        return (wxWebKitCompatibilityMode)m_impl->frame->document()->compatibilityMode();
 
-    return NoDocument;
+    return QuirksMode;
 }
 
 void wxWebFrame::GrantUniversalAccess()
diff --git a/WebKit/wx/WebFrame.h b/WebKit/wx/WebFrame.h
index ba30022..3e9355a 100644
--- a/WebKit/wx/WebFrame.h
+++ b/WebKit/wx/WebFrame.h
@@ -93,7 +93,7 @@ private:
 };
 
 // based on enums in WebCore/dom/Document.h
-enum wxWebKitParseMode { Compat, AlmostStrict, Strict, NoDocument };
+enum wxWebKitCompatibilityMode { QuirksMode, LimitedQuirksMode, NoQuirksMode };
 
 class WXDLLIMPEXP_WEBKIT wxWebFrame
 {
@@ -167,7 +167,7 @@ public:
     
     bool ShouldClose() const;
     
-    wxWebKitParseMode GetParseMode() const;
+    wxWebKitCompatibilityMode GetCompatibilityMode() const;
     
     void GrantUniversalAccess();
     
diff --git a/WebKit/wx/WebView.cpp b/WebKit/wx/WebView.cpp
index 92488dd..d0be9cb 100644
--- a/WebKit/wx/WebView.cpp
+++ b/WebKit/wx/WebView.cpp
@@ -1144,12 +1144,12 @@ wxWebSettings wxWebView::GetWebSettings()
     return wxWebSettings();
 }
 
-wxWebKitParseMode wxWebView::GetParseMode() const
+wxWebKitCompatibilityMode wxWebView::GetCompatibilityMode() const
 {
     if (m_mainFrame)
-        return m_mainFrame->GetParseMode();
+        return m_mainFrame->GetCompatibilityMode();
 
-    return NoDocument;
+    return QuirksMode;
 }
 
 void wxWebView::GrantUniversalAccess()
diff --git a/WebKit/wx/WebView.h b/WebKit/wx/WebView.h
index 8f70408..3ddb45e 100644
--- a/WebKit/wx/WebView.h
+++ b/WebKit/wx/WebView.h
@@ -221,7 +221,7 @@ public:
                              const wxString& password = wxEmptyString);
 
     wxWebSettings GetWebSettings();
-    wxWebKitParseMode GetParseMode() const;
+    wxWebKitCompatibilityMode GetCompatibilityMode() const;
     
     /*
         This method allows cross site-scripting (XSS) in the WebView. 
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 2716186..f1d89f5 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-28  Kevin Ollivier  <kevino at theolliviers.com>
+
+        [wx] Build fix after directory addition.
+
+        * wx/build/settings.py:
+
 2010-08-28  Chris Guillory   <chris.guillory at google.com>
 
         Reviewed by Chris Fleizach.
diff --git a/WebKitTools/wx/build/settings.py b/WebKitTools/wx/build/settings.py
index 74d9789..f7449be 100644
--- a/WebKitTools/wx/build/settings.py
+++ b/WebKitTools/wx/build/settings.py
@@ -113,6 +113,7 @@ webcore_dirs = [
     'WebCore/history', 
     'WebCore/html',
     'WebCore/html/canvas',
+    'WebCore/html/parser',
     'WebCore/inspector', 
     'WebCore/loader', 
     'WebCore/loader/appcache', 

-- 
WebKit Debian packaging