From 4576aa36e9a9671459299c7963ac95aa94beaea9 Mon Sep 17 00:00:00 2001 From: "Shimeng (Simon) Wang" Date: Tue, 7 Dec 2010 17:22:45 -0800 Subject: Merge WebKit at r73109: Initial merge by git. Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8 --- WebCore/platform/MIMETypeRegistry.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'WebCore/platform/MIMETypeRegistry.cpp') diff --git a/WebCore/platform/MIMETypeRegistry.cpp b/WebCore/platform/MIMETypeRegistry.cpp index 9977fe7..0f4cc0e 100644 --- a/WebCore/platform/MIMETypeRegistry.cpp +++ b/WebCore/platform/MIMETypeRegistry.cpp @@ -143,7 +143,7 @@ static void initializeSupportedImageMIMETypes() "image/x-icon", // ico "image/x-xbitmap" // xbm }; - for (size_t i = 0; i < sizeof(types) / sizeof(types[0]); ++i) { + for (size_t i = 0; i < WTF_ARRAY_LENGTH(types); ++i) { supportedImageMIMETypes->add(types[i]); supportedImageResourceMIMETypes->add(types[i]); } @@ -211,7 +211,7 @@ static void initializeSupportedJavaScriptMIMETypes() "text/jscript", "text/livescript", }; - for (size_t i = 0; i < sizeof(types) / sizeof(types[0]); ++i) + for (size_t i = 0; i < WTF_ARRAY_LENGTH(types); ++i) supportedJavaScriptMIMETypes->add(types[i]); } @@ -246,7 +246,7 @@ static void initializeSupportedNonImageMimeTypes() COMPILE_ASSERT(sizeof(types) / sizeof(types[0]) <= 16, nonimage_mime_types_must_be_less_than_or_equal_to_16); - for (size_t i = 0; i < sizeof(types)/sizeof(types[0]); ++i) + for (size_t i = 0; i < WTF_ARRAY_LENGTH(types); ++i) supportedNonImageMIMETypes->add(types[i]); #if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size -- cgit v1.1