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

ap at apple.com ap at apple.com
Wed Dec 22 15:42:50 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 3177319b75f3ccd8e5715a1bebbc2e14010d28ab
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 10 21:38:28 2010 +0000

            Release build fix.
    
            * css/StyleSheet.cpp: isAcceptableStyleSheetParent() is a debug-only function.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71769 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c659904..580c609 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-10  Alexey Proskuryakov  <ap at apple.com>
+
+        Release build fix.
+
+        * css/StyleSheet.cpp: isAcceptableStyleSheetParent() is a debug-only function.
+
 2010-11-08  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/css/StyleSheet.cpp b/WebCore/css/StyleSheet.cpp
index 7cc1f4b..854b63c 100644
--- a/WebCore/css/StyleSheet.cpp
+++ b/WebCore/css/StyleSheet.cpp
@@ -27,6 +27,7 @@
 
 namespace WebCore {
 
+#if !ASSERT_DISABLED
 static bool isAcceptableStyleSheetParent(Node* parentNode)
 {
     // Only these nodes can be parents of StyleSheets, and they need to call clearOwnerNode() when moved out of document.
@@ -40,6 +41,7 @@ static bool isAcceptableStyleSheetParent(Node* parentNode)
 #endif    
     ;
 }
+#endif
 
 StyleSheet::StyleSheet(StyleSheet* parentSheet, const String& originalURL, const KURL& finalURL)
     : StyleList(parentSheet)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list