[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
darin at apple.com
darin at apple.com
Fri Jan 21 14:36:10 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit 031b33b8bfc6a8c4d468b938368b0e6440765f87
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 23 00:50:06 2010 +0000
* WebProcess/WebPage/WebPage.cpp: Add #if to try to fix non-Mac builds.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74522 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 8cd733d..483aefc 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,9 @@
2010-12-22 Darin Adler <darin at apple.com>
+ * WebProcess/WebPage/WebPage.cpp: Add #if to try to fix non-Mac builds.
+
+2010-12-22 Darin Adler <darin at apple.com>
+
Reviewed by Anders Carlsson.
Make Speech menu items work in WebKit2
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index f00b467..dd8dd60 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -1370,6 +1370,8 @@ void WebPage::setCustomTextEncodingName(const String& encoding)
m_page->mainFrame()->loader()->reloadWithOverrideEncoding(encoding);
}
+#if PLATFORM(MAC)
+
bool WebPage::isSpeaking()
{
bool result;
@@ -1386,4 +1388,6 @@ void WebPage::stopSpeaking()
send(Messages::WebPageProxy::StopSpeaking());
}
+#endif
+
} // namespace WebKit
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list