[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

tonyg at chromium.org tonyg at chromium.org
Sun Feb 20 23:07:32 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit 938b60ed6a0102a500fea4f716268bfb9745829d
Author: tonyg at chromium.org <tonyg at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 17 21:38:32 2011 +0000

    2011-01-17  Tony Gentilcore  <tonyg at chromium.org>
    
            Reviewed by Alexey Proskuryakov.
    
            Fix some headers with missing or misspelled #ifndef guards
            https://bugs.webkit.org/show_bug.cgi?id=52545
    
            * wtf/RefPtrHashMap.h:
    2011-01-17  Tony Gentilcore  <tonyg at chromium.org>
    
            Reviewed by Alexey Proskuryakov.
    
            Fix some headers with missing or misspelled #ifndef guards
            https://bugs.webkit.org/show_bug.cgi?id=52545
    
            No new tests because no new functionality.
    
            * ForwardingHeaders/runtime/InitializeThreading.h:
            * editing/SmartReplace.h:
            * loader/CrossOriginAccessControl.h:
            * loader/NetscapePlugInStreamLoader.h:
            * platform/chromium/ClipboardUtilitiesChromium.h:
            * platform/graphics/cairo/DrawErrorUnderline.h:
            * platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h:
            * platform/graphics/cg/GraphicsContextPlatformPrivateCG.h:
            * platform/graphics/cg/PDFDocumentImage.h:
            * platform/win/WebCoreTextRenderer.h:
    2011-01-17  Tony Gentilcore  <tonyg at chromium.org>
    
            Reviewed by Alexey Proskuryakov.
    
            Fix some headers with missing or misspelled #ifndef guards
            https://bugs.webkit.org/show_bug.cgi?id=52545
    
            * WebKitStatistics.h:
    2011-01-17  Tony Gentilcore  <tonyg at chromium.org>
    
            Reviewed by Alexey Proskuryakov.
    
            Fix some headers with missing or misspelled #ifndef guards
            https://bugs.webkit.org/show_bug.cgi?id=52545
    
            * Shared/UserMessageCoders.h:
            * WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h:
            * WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h:
            * WebProcess/WebProcessMain.h:
    2011-01-17  Tony Gentilcore  <tonyg at chromium.org>
    
            Reviewed by Alexey Proskuryakov.
    
            Fix some headers with missing or misspelled #ifndef guards
            https://bugs.webkit.org/show_bug.cgi?id=52545
    
            * DumpRenderTree/chromium/TestEventPrinter.h:
            * DumpRenderTree/chromium/WebPreferences.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75971 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index c7b3589..d79c782 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-17  Tony Gentilcore  <tonyg at chromium.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Fix some headers with missing or misspelled #ifndef guards
+        https://bugs.webkit.org/show_bug.cgi?id=52545
+
+        * wtf/RefPtrHashMap.h:
+
 2011-01-17  Dan Bernstein  <mitz at apple.com>
 
         Rubber-stamped by Mark Rowe.
diff --git a/Source/JavaScriptCore/wtf/RefPtrHashMap.h b/Source/JavaScriptCore/wtf/RefPtrHashMap.h
index 7f6ebfe..b9e7eea 100644
--- a/Source/JavaScriptCore/wtf/RefPtrHashMap.h
+++ b/Source/JavaScriptCore/wtf/RefPtrHashMap.h
@@ -18,6 +18,9 @@
  *
  */
 
+#ifndef RefPtrHashMap_h
+#define RefPtrHashMap_h
+
 namespace WTF {
 
     // This specialization is a direct copy of HashMap, with overloaded functions
@@ -334,3 +337,5 @@ namespace WTF {
     }
 
 } // namespace WTF
+
+#endif // RefPtrHashMap_h
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 35c0beb..7d88f3b 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2011-01-17  Tony Gentilcore  <tonyg at chromium.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Fix some headers with missing or misspelled #ifndef guards
+        https://bugs.webkit.org/show_bug.cgi?id=52545
+
+        No new tests because no new functionality.
+
+        * ForwardingHeaders/runtime/InitializeThreading.h:
+        * editing/SmartReplace.h:
+        * loader/CrossOriginAccessControl.h:
+        * loader/NetscapePlugInStreamLoader.h:
+        * platform/chromium/ClipboardUtilitiesChromium.h:
+        * platform/graphics/cairo/DrawErrorUnderline.h:
+        * platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h:
+        * platform/graphics/cg/GraphicsContextPlatformPrivateCG.h:
+        * platform/graphics/cg/PDFDocumentImage.h:
+        * platform/win/WebCoreTextRenderer.h:
+
 2011-01-17  Pavel Feldman  <pfeldman at chromium.org>
 
         Not reviewed: follow-up fix for r52574: do not reuse clear() for navigation.
diff --git a/Source/WebCore/ForwardingHeaders/runtime/InitializeThreading.h b/Source/WebCore/ForwardingHeaders/runtime/InitializeThreading.h
index bd4f735..ee1f856 100644
--- a/Source/WebCore/ForwardingHeaders/runtime/InitializeThreading.h
+++ b/Source/WebCore/ForwardingHeaders/runtime/InitializeThreading.h
@@ -1,4 +1,4 @@
-#ifndef WebCore_FWD_InitializeThreadingn_h
+#ifndef WebCore_FWD_InitializeThreading_h
 #define WebCore_FWD_InitializeThreading_h
 #include <JavaScriptCore/InitializeThreading.h>
 #endif
diff --git a/Source/WebCore/editing/SmartReplace.h b/Source/WebCore/editing/SmartReplace.h
index 5a37137..b072e58 100644
--- a/Source/WebCore/editing/SmartReplace.h
+++ b/Source/WebCore/editing/SmartReplace.h
@@ -26,6 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef SmartReplace_h
+#define SmartReplace_h
+
 #include <wtf/unicode/Unicode.h>
 
 namespace WebCore {
@@ -33,3 +36,5 @@ namespace WebCore {
 bool isCharacterSmartReplaceExempt(UChar32 c, bool isPreviousCharacter);
 
 } // namespace WebCore
+
+#endif // SmartReplace_h
diff --git a/Source/WebCore/loader/CrossOriginAccessControl.h b/Source/WebCore/loader/CrossOriginAccessControl.h
index c44963b..50c231e 100644
--- a/Source/WebCore/loader/CrossOriginAccessControl.h
+++ b/Source/WebCore/loader/CrossOriginAccessControl.h
@@ -24,6 +24,9 @@
  *
  */
 
+#ifndef CrossOriginAccessControl_h
+#define CrossOriginAccessControl_h
+
 #include <wtf/Forward.h>
 
 namespace WebCore {
@@ -40,3 +43,5 @@ namespace WebCore {
     bool passesAccessControlCheck(const ResourceResponse&, bool includeCredentials, SecurityOrigin*, String& errorDescription);
 
 } // namespace WebCore
+
+#endif // CrossOriginAccessControl_h
diff --git a/Source/WebCore/loader/NetscapePlugInStreamLoader.h b/Source/WebCore/loader/NetscapePlugInStreamLoader.h
index 4d7d03b..8db555e 100644
--- a/Source/WebCore/loader/NetscapePlugInStreamLoader.h
+++ b/Source/WebCore/loader/NetscapePlugInStreamLoader.h
@@ -26,6 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef NetscapePlugInStreamLoader_h
+#define NetscapePlugInStreamLoader_h
+
 #include "ResourceLoader.h"
 #include <wtf/Forward.h>
 
@@ -68,3 +71,5 @@ namespace WebCore {
     };
 
 }
+
+#endif // NetscapePlugInStreamLoader_h
diff --git a/Source/WebCore/platform/chromium/ClipboardUtilitiesChromium.h b/Source/WebCore/platform/chromium/ClipboardUtilitiesChromium.h
index 9fdad42..3e6f92a 100644
--- a/Source/WebCore/platform/chromium/ClipboardUtilitiesChromium.h
+++ b/Source/WebCore/platform/chromium/ClipboardUtilitiesChromium.h
@@ -28,6 +28,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef ClipboardUtilitiesChromium_h
+#define ClipboardUtilitiesChromium_h
+
 #include <wtf/Forward.h>
 
 namespace WebCore {
@@ -40,3 +43,5 @@ void replaceNewlinesWithWindowsStyleNewlines(String&);
 void replaceNBSPWithSpace(String&);
 
 } // namespace WebCore
+
+#endif // ClipboardUtilitiesChromium_h
diff --git a/Source/WebCore/platform/graphics/cairo/DrawErrorUnderline.h b/Source/WebCore/platform/graphics/cairo/DrawErrorUnderline.h
index 1e0a846..b90bb8c 100644
--- a/Source/WebCore/platform/graphics/cairo/DrawErrorUnderline.h
+++ b/Source/WebCore/platform/graphics/cairo/DrawErrorUnderline.h
@@ -23,6 +23,9 @@
 
 #if PLATFORM(CAIRO)
 
+#ifndef DrawErrorUnderline_h
+#define DrawErrorUnderline_h
+
 #include <cairo.h>
 
 //
@@ -96,4 +99,6 @@ static inline void drawErrorUnderline(cairo_t* cr, double x, double y, double wi
     }
 }
 
+#endif // DrawErrorUnderline_h
+
 #endif
diff --git a/Source/WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h b/Source/WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h
index 5602b6c..a0dfc8c 100644
--- a/Source/WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h
+++ b/Source/WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h
@@ -25,6 +25,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
+#ifndef GraphicsContextPlatformPrivateCairo_h
+#define GraphicsContextPlatformPrivateCairo_h
+
 #include "GraphicsContext.h"
 
 #include "ContextShadow.h"
@@ -111,3 +114,4 @@ public:
 
 } // namespace WebCore
 
+#endif // GraphicsContextPlatformPrivateCairo_h
diff --git a/Source/WebCore/platform/graphics/cg/GraphicsContextPlatformPrivateCG.h b/Source/WebCore/platform/graphics/cg/GraphicsContextPlatformPrivateCG.h
index 1d0a99f..d4fa32e 100644
--- a/Source/WebCore/platform/graphics/cg/GraphicsContextPlatformPrivateCG.h
+++ b/Source/WebCore/platform/graphics/cg/GraphicsContextPlatformPrivateCG.h
@@ -23,6 +23,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
+#ifndef GraphicsContextPlatformPrivateCG_h
+#define GraphicsContextPlatformPrivateCG_h
+
 #include <wtf/RetainPtr.h>
 #include <CoreGraphics/CGContext.h>
 
@@ -84,3 +87,5 @@ public:
 };
 
 }
+
+#endif // GraphicsContextPlatformPrivateCG_h
diff --git a/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h b/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h
index 790d620..ecd57be 100644
--- a/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h
+++ b/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h
@@ -23,6 +23,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
+#ifndef PDFDocumentImage_h
+#define PDFDocumentImage_h
+
 #include "Image.h"
 
 #include "FloatRect.h"
@@ -76,3 +79,5 @@ namespace WebCore {
 }
 
 #endif // PLATFORM(CG)
+
+#endif // PDFDocumentImage_h
diff --git a/Source/WebCore/platform/win/WebCoreTextRenderer.h b/Source/WebCore/platform/win/WebCoreTextRenderer.h
index 7efc1f3..6deef4a 100644
--- a/Source/WebCore/platform/win/WebCoreTextRenderer.h
+++ b/Source/WebCore/platform/win/WebCoreTextRenderer.h
@@ -23,6 +23,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
+#ifndef WebCoreTextRenderer_h
+#define WebCoreTextRenderer_h
+
 #include <wtf/Forward.h>
 
 namespace WebCore {
@@ -43,3 +46,5 @@ namespace WebCore {
     bool WebCoreAlwaysUsesComplexTextCodePath();
 
 } // namespace WebCore
+
+#endif // WebCoreTextRenderer_h
diff --git a/Source/WebKit/win/ChangeLog b/Source/WebKit/win/ChangeLog
index 1c30ba1..1d90743 100644
--- a/Source/WebKit/win/ChangeLog
+++ b/Source/WebKit/win/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-17  Tony Gentilcore  <tonyg at chromium.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Fix some headers with missing or misspelled #ifndef guards
+        https://bugs.webkit.org/show_bug.cgi?id=52545
+
+        * WebKitStatistics.h:
+
 2011-01-17  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/Source/WebKit/win/WebKitStatistics.h b/Source/WebKit/win/WebKitStatistics.h
index b7d116d..5de79f5 100644
--- a/Source/WebKit/win/WebKitStatistics.h
+++ b/Source/WebKit/win/WebKitStatistics.h
@@ -27,7 +27,7 @@
  */
 
 #ifndef WebKitStatistics_h
-#define WebkitStatistics_h
+#define WebKitStatistics_h
 
 #include "WebKit.h"
 
@@ -70,4 +70,4 @@ protected:
     ULONG m_refCount;
 };
 
-#endif
+#endif // WebKitStatistics_h
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index f2a693f..c836cfa 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-17  Tony Gentilcore  <tonyg at chromium.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Fix some headers with missing or misspelled #ifndef guards
+        https://bugs.webkit.org/show_bug.cgi?id=52545
+
+        * Shared/UserMessageCoders.h:
+        * WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h:
+        * WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h:
+        * WebProcess/WebProcessMain.h:
+
 2011-01-17  Alexey Proskuryakov  <ap at apple.com>
 
         Build fix.
diff --git a/Source/WebKit2/Shared/UserMessageCoders.h b/Source/WebKit2/Shared/UserMessageCoders.h
index e1d0e19..1326a98 100644
--- a/Source/WebKit2/Shared/UserMessageCoders.h
+++ b/Source/WebKit2/Shared/UserMessageCoders.h
@@ -23,6 +23,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef UserMessageCoders_h
+#define UserMessageCoders_h
+
 #include "ArgumentDecoder.h"
 #include "ArgumentEncoder.h"
 #include "ImmutableArray.h"
@@ -302,3 +305,5 @@ protected:
 };
 
 } // namespace WebKit
+
+#endif // UserMessageCoders_h
diff --git a/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h b/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h
index 4670e41..eff4600 100644
--- a/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h
+++ b/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h
@@ -23,6 +23,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef InjectedBundleNodeHandle_h
+#define InjectedBundleNodeHandle_h
+
 #include "APIObject.h"
 #include <JavaScriptCore/JSBase.h>
 #include <wtf/Forward.h>
@@ -72,3 +75,5 @@ private:
 };
 
 } // namespace WebKit
+
+#endif // InjectedBundleNodeHandle_h
diff --git a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h
index 6e434c7..49d6696 100644
--- a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h
+++ b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h
@@ -23,6 +23,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef InjectedBundleUserMessageCoders_h
+#define InjectedBundleUserMessageCoders_h
+
 #include "UserMessageCoders.h"
 #include "WebFrame.h"
 #include "WebPage.h"
@@ -134,3 +137,5 @@ public:
 };
 
 } // namespace WebKit
+
+#endif // InjectedBundleUserMessageCoders_h
diff --git a/Source/WebKit2/WebProcess/WebProcessMain.h b/Source/WebKit2/WebProcess/WebProcessMain.h
index 8923bdd..a287d63 100644
--- a/Source/WebKit2/WebProcess/WebProcessMain.h
+++ b/Source/WebKit2/WebProcess/WebProcessMain.h
@@ -23,6 +23,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef WebProcessMain_h
+#define WebProcessMain_h
+
 #include "WKBase.h"
 
 namespace WebKit {
@@ -32,3 +35,5 @@ class CommandLine;
 int WebProcessMain(const CommandLine&);
 
 } // namespace WebKit
+
+#endif // WebProcessMain_h
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 6551dbe..9c81c47 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-17  Tony Gentilcore  <tonyg at chromium.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Fix some headers with missing or misspelled #ifndef guards
+        https://bugs.webkit.org/show_bug.cgi?id=52545
+
+        * DumpRenderTree/chromium/TestEventPrinter.h:
+        * DumpRenderTree/chromium/WebPreferences.h:
+
 2011-01-17  Jessie Berlin  <jberlin at apple.com>
 
         Reviewed by Anders Carlsson.
diff --git a/Tools/DumpRenderTree/chromium/TestEventPrinter.h b/Tools/DumpRenderTree/chromium/TestEventPrinter.h
index fdbfd02..337aa1c 100644
--- a/Tools/DumpRenderTree/chromium/TestEventPrinter.h
+++ b/Tools/DumpRenderTree/chromium/TestEventPrinter.h
@@ -28,6 +28,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef TestEventPrinter_h
+#define TestEventPrinter_h
+
 class TestEventPrinter {
 public:
     static TestEventPrinter* createDRTPrinter();
@@ -41,3 +44,5 @@ public:
     virtual void handleImageFooter() const = 0;
     virtual void handleTestFooter(bool dumpedAnything) const = 0;
 };
+
+#endif // TestEventPrinter_h
diff --git a/Tools/DumpRenderTree/chromium/WebPreferences.h b/Tools/DumpRenderTree/chromium/WebPreferences.h
index 46877c0..50bb8cc 100644
--- a/Tools/DumpRenderTree/chromium/WebPreferences.h
+++ b/Tools/DumpRenderTree/chromium/WebPreferences.h
@@ -29,7 +29,7 @@
  */
 
 #ifndef WebPreferences_h
-#define WebPerferences_h
+#define WebPreferences_h
 
 #include "WebSettings.h"
 #include "WebString.h"

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list