Remove unneeded casts once we upgrade to a version of Visual Studio that is not broken
authorpeavo@outlook.com <peavo@outlook.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 2 May 2016 20:32:25 +0000 (20:32 +0000)
committerpeavo@outlook.com <peavo@outlook.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 2 May 2016 20:32:25 +0000 (20:32 +0000)
https://bugs.webkit.org/show_bug.cgi?id=121235

Reviewed by Darin Adler.

* css/MediaQueryEvaluator.cpp:
(WebCore::createFunctionMap):
* dom/make_names.pl:
(printWrapperFactoryCppFile):
* loader/archive/ArchiveFactory.cpp:
(WebCore::archiveMIMETypes):
* rendering/svg/SVGPathData.cpp:
(WebCore::updatePathFromGraphicsElement):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@200336 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/css/MediaQueryEvaluator.cpp
Source/WebCore/dom/make_names.pl
Source/WebCore/loader/archive/ArchiveFactory.cpp
Source/WebCore/rendering/svg/SVGPathData.cpp

index 7873beb..d29b560 100644 (file)
@@ -1,3 +1,19 @@
+2016-05-02  Per Arne Vollan  <peavo@outlook.com>
+
+        Remove unneeded casts once we upgrade to a version of Visual Studio that is not broken
+        https://bugs.webkit.org/show_bug.cgi?id=121235
+
+        Reviewed by Darin Adler.
+
+        * css/MediaQueryEvaluator.cpp:
+        (WebCore::createFunctionMap):
+        * dom/make_names.pl:
+        (printWrapperFactoryCppFile):
+        * loader/archive/ArchiveFactory.cpp:
+        (WebCore::archiveMIMETypes):
+        * rendering/svg/SVGPathData.cpp:
+        (WebCore::updatePathFromGraphicsElement):
+
 2016-05-02  Anders Carlsson  <andersca@apple.com>
 
         Fix build.
index 3fd4bc4..6cf042d 100644 (file)
@@ -721,14 +721,12 @@ static bool any_pointerMediaFeatureEval(CSSValue* value, const CSSToLengthConver
     return pointerMediaFeatureEval(value, cssToLengthConversionData, frame, prefix);
 }
 
-// FIXME: Remove unnecessary '&' from the following 'ADD_TO_FUNCTIONMAP' definition
-// once we switch to a non-broken Visual Studio compiler.  https://bugs.webkit.org/show_bug.cgi?id=121235
 static void createFunctionMap()
 {
     // Create the table.
     gFunctionMap = new FunctionMap;
 #define ADD_TO_FUNCTIONMAP(name, str)  \
-    gFunctionMap->set(name##MediaFeature.impl(), &name##MediaFeatureEval);
+    gFunctionMap->set(name##MediaFeature.impl(), name##MediaFeatureEval);
     CSS_MEDIAQUERY_NAMES_FOR_EACH_MEDIAFEATURE(ADD_TO_FUNCTIONMAP);
 #undef ADD_TO_FUNCTIONMAP
 }
index 14e8329..20d0194 100755 (executable)
@@ -1296,9 +1296,7 @@ END
             $ucTag = $enabledTags{$tag}{JSInterfaceName};
         }
 
-        # FIXME Remove unnecessary '&' from the following (print) line once we switch to a non-broken Visual Studio compiler.
-        # https://bugs.webkit.org/show_bug.cgi?id=121235:
-        print F "        { ${tag}Tag, &create${ucTag}Wrapper },\n";
+        print F "        { ${tag}Tag, create${ucTag}Wrapper },\n";
 
         if ($conditional) {
             print F "#endif\n";
index cf6ad11..90b6799 100644 (file)
@@ -64,14 +64,12 @@ static ArchiveMIMETypesMap& archiveMIMETypes()
     if (initialized)
         return mimeTypes;
 
-    // FIXME: Remove unnecessary 'static_cast<RawDataCreationFunction*>' from the following 'mimeTypes.set' operations
-    // once we switch to a non-broken Visual Studio compiler.  https://bugs.webkit.org/show_bug.cgi?id=121235
 #if ENABLE(WEB_ARCHIVE) && USE(CF)
-    mimeTypes.get().set("application/x-webarchive", static_cast<RawDataCreationFunction*>(&archiveFactoryCreate<LegacyWebArchive>));
+    mimeTypes.get().set("application/x-webarchive", archiveFactoryCreate<LegacyWebArchive>);
 #endif
 #if ENABLE(MHTML)
-    mimeTypes.get().set("multipart/related", static_cast<RawDataCreationFunction*>(&archiveFactoryCreate<MHTMLArchive>));
-    mimeTypes.get().set("application/x-mimearchive", static_cast<RawDataCreationFunction*>(&archiveFactoryCreate<MHTMLArchive>));
+    mimeTypes.get().set("multipart/related", archiveFactoryCreate<MHTMLArchive>);
+    mimeTypes.get().set("application/x-mimearchive", archiveFactoryCreate<MHTMLArchive>);
 #endif
 
     initialized = true;
index 84ce8d6..06cb222 100644 (file)
@@ -158,13 +158,13 @@ void updatePathFromGraphicsElement(SVGElement* element, Path& path)
     static HashMap<AtomicStringImpl*, PathUpdateFunction>* map = 0;
     if (!map) {
         map = new HashMap<AtomicStringImpl*, PathUpdateFunction>;
-        map->set(SVGNames::circleTag.localName().impl(), &updatePathFromCircleElement);
-        map->set(SVGNames::ellipseTag.localName().impl(), &updatePathFromEllipseElement);
-        map->set(SVGNames::lineTag.localName().impl(), &updatePathFromLineElement);
-        map->set(SVGNames::pathTag.localName().impl(), &updatePathFromPathElement);
-        map->set(SVGNames::polygonTag.localName().impl(), &updatePathFromPolygonElement);
-        map->set(SVGNames::polylineTag.localName().impl(), &updatePathFromPolylineElement);
-        map->set(SVGNames::rectTag.localName().impl(), &updatePathFromRectElement);
+        map->set(SVGNames::circleTag.localName().impl(), updatePathFromCircleElement);
+        map->set(SVGNames::ellipseTag.localName().impl(), updatePathFromEllipseElement);
+        map->set(SVGNames::lineTag.localName().impl(), updatePathFromLineElement);
+        map->set(SVGNames::pathTag.localName().impl(), updatePathFromPathElement);
+        map->set(SVGNames::polygonTag.localName().impl(), updatePathFromPolygonElement);
+        map->set(SVGNames::polylineTag.localName().impl(), updatePathFromPolylineElement);
+        map->set(SVGNames::rectTag.localName().impl(), updatePathFromRectElement);
     }
 
     if (PathUpdateFunction pathUpdateFunction = map->get(element->localName().impl()))