[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 6efdd42276b12ede35c86f9d5bd389abdbe5d0ad..c111602fd861aa6fd7b7d8fd57cdb556018922de 100644 (file)
--- a/WebKit/wx/ChangeLog
+++ b/WebKit/wx/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-28  Kevin Ollivier  <kevino@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@alldunn.com>
 
         Reviewed by Kevin Ollivier.
 2010-08-26  Robin Dunn  <robin@alldunn.com>
 
         Reviewed by Kevin Ollivier.

diff --git a/WebKit/wx/WebFrame.cpp b/WebKit/wx/WebFrame.cpp
index da3bfe2593a38b8681a8729dd97284b3e078b5fe..fe45eea56d025af648cd72e2e55cd66d05c378c4 100644 (file)
--- a/WebKit/wx/WebFrame.cpp
+++ b/WebKit/wx/WebFrame.cpp
@@ -476,12 +476,12 @@ bool wxWebFrame::ShouldClose() const
     return true;
 }
 
     return true;
 }
 

-wxWebKitParseMode wxWebFrame::GetParseMode() const
+wxWebKitCompatibilityMode wxWebFrame::GetCompatibilityMode() const

 {
     if (m_impl->frame && m_impl->frame->document())
 {
     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()
 }
 
 void wxWebFrame::GrantUniversalAccess()

diff --git a/WebKit/wx/WebFrame.h b/WebKit/wx/WebFrame.h
index ba300229f6f9e41eeda8265afb0c7eeaf80205ce..3e9355ae31471afad7c4c67394c1d165d070457f 100644 (file)
--- a/WebKit/wx/WebFrame.h
+++ b/WebKit/wx/WebFrame.h
@@ -93,7 +93,7 @@ private:
 };
 
 // based on enums in WebCore/dom/Document.h
 };
 
 // based on enums in WebCore/dom/Document.h

-enum wxWebKitParseMode { Compat, AlmostStrict, Strict, NoDocument };
+enum wxWebKitCompatibilityMode { QuirksMode, LimitedQuirksMode, NoQuirksMode };

 
 class WXDLLIMPEXP_WEBKIT wxWebFrame
 {
 
 class WXDLLIMPEXP_WEBKIT wxWebFrame
 {


@@ -167,7 +167,7 @@ public:
     
     bool ShouldClose() const;
     
     
     bool ShouldClose() const;
     

-    wxWebKitParseMode GetParseMode() const;
+    wxWebKitCompatibilityMode GetCompatibilityMode() const;

     
     void GrantUniversalAccess();
     
     
     void GrantUniversalAccess();
     

diff --git a/WebKit/wx/WebView.cpp b/WebKit/wx/WebView.cpp
index 92488dde134ef2013812a2382cc93994073df5fd..d0be9cb972db82647a669e050014f5a2a16c106f 100644 (file)
--- a/WebKit/wx/WebView.cpp
+++ b/WebKit/wx/WebView.cpp
@@ -1144,12 +1144,12 @@ wxWebSettings wxWebView::GetWebSettings()
     return wxWebSettings();
 }
 
     return wxWebSettings();
 }
 

-wxWebKitParseMode wxWebView::GetParseMode() const
+wxWebKitCompatibilityMode wxWebView::GetCompatibilityMode() const

 {
     if (m_mainFrame)
 {
     if (m_mainFrame)

-        return m_mainFrame->GetParseMode();
+        return m_mainFrame->GetCompatibilityMode();

 
 

-    return NoDocument;
+    return QuirksMode;

 }
 
 void wxWebView::GrantUniversalAccess()
 }
 
 void wxWebView::GrantUniversalAccess()

diff --git a/WebKit/wx/WebView.h b/WebKit/wx/WebView.h
index 8f70408cd905ba43272c3a23b71516352fb6a883..3ddb45ecba529060bc348e7a5f0eaba00a3c8560 100644 (file)
--- a/WebKit/wx/WebView.h
+++ b/WebKit/wx/WebView.h
@@ -221,7 +221,7 @@ public:
                              const wxString& password = wxEmptyString);
 
     wxWebSettings GetWebSettings();
                              const wxString& password = wxEmptyString);
 
     wxWebSettings GetWebSettings();

-    wxWebKitParseMode GetParseMode() const;
+    wxWebKitCompatibilityMode GetCompatibilityMode() const;

     
     /*
         This method allows cross site-scripting (XSS) in the WebView. 
     
     /*
         This method allows cross site-scripting (XSS) in the WebView. 

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 271618607832c543fb52d33882d26d11a8acab48..f1d89f55fc335a9161cd67915b1d558fcc78bd92 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-28  Kevin Ollivier  <kevino@theolliviers.com>
+
+        [wx] Build fix after directory addition.
+
+        * wx/build/settings.py:
+

 2010-08-28  Chris Guillory   <chris.guillory@google.com>
 
         Reviewed by Chris Fleizach.
 2010-08-28  Chris Guillory   <chris.guillory@google.com>
 
         Reviewed by Chris Fleizach.

diff --git a/WebKitTools/wx/build/settings.py b/WebKitTools/wx/build/settings.py
index 74d9789065fcd07b2db4fdfcc6df9a3d368c683f..f7449be21407f9ad6705121081a33b6f88abb579 100644 (file)
--- 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/history', 
     'WebCore/html',
     'WebCore/html/canvas',

+    'WebCore/html/parser',

     'WebCore/inspector', 
     'WebCore/loader', 
     'WebCore/loader/appcache', 
     'WebCore/inspector', 
     'WebCore/loader', 
     'WebCore/loader/appcache',