[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

kevino at webkit.org kevino at webkit.org
Wed Apr 7 23:41:21 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit c19104ca76a1041a8a0eebf6ff8ead391d94ddeb
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 14 01:33:49 2009 +0000

    wx build fix after r50923 change to externalRepresentation.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50984 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
index d05688b..12ad3fd 100644
--- a/WebKit/wx/ChangeLog
+++ b/WebKit/wx/ChangeLog
@@ -1,3 +1,10 @@
+2009-11-13  Kevin Ollivier  <kevino at theolliviers.com>
+
+        wx build fix after r50923 change to externalRepresentation.
+
+        * WebFrame.cpp:
+        (wxWebFrame::GetExternalRepresentation):
+
 2009-11-13  Adam Roben  <aroben at apple.com>
 
         Update for changes to FrameLoaderClient
diff --git a/WebKit/wx/WebFrame.cpp b/WebKit/wx/WebFrame.cpp
index c7e6d6b..bd983f6 100644
--- a/WebKit/wx/WebFrame.cpp
+++ b/WebKit/wx/WebFrame.cpp
@@ -181,7 +181,7 @@ wxString wxWebFrame::GetExternalRepresentation()
     if (m_impl->frame->view() && m_impl->frame->view()->layoutPending())
         m_impl->frame->view()->layout();
 
-    return externalRepresentation(m_impl->frame->contentRenderer());
+    return externalRepresentation(m_impl->frame);
 }
 
 wxString wxWebFrame::RunScript(const wxString& javascript)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list