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

mitz at apple.com mitz at apple.com
Wed Dec 22 15:30:05 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit c304f334cbd3364a692db06548f90f65ba392824
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 5 03:58:41 2010 +0000

    Build fix.
    
    * editing/Editor.cpp:
    (WebCore::Editor::dismissCorrectionPanel):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71386 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bf169ce..4788e4d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-04  Dan Bernstein  <mitz at apple.com>
+
+        Build fix.
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::dismissCorrectionPanel):
+
 2010-11-04  Jia Pu  <jpu at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebCore/editing/Editor.cpp b/WebCore/editing/Editor.cpp
index 4ae4924..e7d066e 100644
--- a/WebCore/editing/Editor.cpp
+++ b/WebCore/editing/Editor.cpp
@@ -2515,6 +2515,8 @@ void Editor::dismissCorrectionPanel(CorrectionWasRejectedOrNot correctionWasReje
     m_correctionPanelInfo.m_rangeToBeReplaced.clear();
     if (client())
         client()->dismissCorrectionPanel(correctionWasRejectedOrNot);
+#else
+    UNUSED_PARAM(correctionWasRejectedOrNot);
 #endif
 }
 void Editor::removeSpellAndCorrectionMarkersFromWordsToBeEdited(bool doNotRemoveIfSelectionAtWordBoundary)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list