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

andersca at apple.com andersca at apple.com
Wed Dec 22 18:33:48 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 5a9318b04f7e979efbe075230913f1bdadb1c544
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 13 23:19:59 2010 +0000

    Fix build.
    
    * UIProcess/WebPageProxy.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73974 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 220d7de..b902f3c 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-13  Anders Carlsson  <andersca at apple.com>
+
+        Fix build.
+
+        * UIProcess/WebPageProxy.h:
+
 2010-12-13  Brian Weinstein  <bweinstein at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/WebKit2/UIProcess/WebPageProxy.h b/WebKit2/UIProcess/WebPageProxy.h
index 6344697..3b80048 100644
--- a/WebKit2/UIProcess/WebPageProxy.h
+++ b/WebKit2/UIProcess/WebPageProxy.h
@@ -395,7 +395,9 @@ private:
 
     void didFinishLoadingDataForCustomRepresentation(const CoreIPC::DataReference& data);
 
+#if PLATFORM(MAC)
     void setComplexTextInputEnabled(uint64_t pluginComplexTextInputIdentifier, bool complexTextInputEnabled);
+#endif
 
     PageClient* m_pageClient;
     WebLoaderClient m_loaderClient;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list