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

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 12:53:35 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 27cc86a55c6a18f6f69db3d78a766d5a3b6ca05d
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 1 03:12:16 2010 +0000

    2010-08-31  Kwang Yul Seo  <skyul at company100.net>
    
            Reviewed by Adam Barth.
    
            [BREWMP] Add PLATFORM(BREWMP) guard to PluginViewNone
            https://bugs.webkit.org/show_bug.cgi?id=44768
    
            Build fix. Add PLATFORM(BREWMP) guard to add dummy PluginView::privateBrowsingStateChanged
            and PluginView::setJavaScriptPaused.
    
            * plugins/PluginViewNone.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66569 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index df2d83d..ad60ba6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-31  Kwang Yul Seo  <skyul at company100.net>
+
+        Reviewed by Adam Barth.
+
+        [BREWMP] Add PLATFORM(BREWMP) guard to PluginViewNone
+        https://bugs.webkit.org/show_bug.cgi?id=44768
+
+        Build fix. Add PLATFORM(BREWMP) guard to add dummy PluginView::privateBrowsingStateChanged
+        and PluginView::setJavaScriptPaused.
+
+        * plugins/PluginViewNone.cpp:
+
 2010-08-31  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/plugins/PluginViewNone.cpp b/WebCore/plugins/PluginViewNone.cpp
index ab8f620..9aeaf3b 100644
--- a/WebCore/plugins/PluginViewNone.cpp
+++ b/WebCore/plugins/PluginViewNone.cpp
@@ -141,7 +141,7 @@ void PluginView::handleFocusOutEvent()
 // ports using PluginView, but until then, if new functions like this are 
 // added, please make sure they have the proper platform #ifs so that changes
 // do not break ports who compile both this file and PluginView.cpp.   
-#if PLATFORM(MAC) || PLATFORM(CHROMIUM) || PLATFORM(EFL) || (OS(WINCE) && !PLATFORM(QT)) || (PLATFORM(QT) && !OS(WINCE))
+#if PLATFORM(MAC) || PLATFORM(CHROMIUM) || PLATFORM(EFL) || (OS(WINCE) && !PLATFORM(QT)) || (PLATFORM(QT) && !OS(WINCE)) || PLATFORM(BREWMP)
 #if ENABLE(NETSCAPE_PLUGIN_API)
 void PluginView::keepAlive(NPP)
 {

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list