From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- Source/WebCore/css/MediaFeatureNames.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'Source/WebCore/css/MediaFeatureNames.cpp') diff --git a/Source/WebCore/css/MediaFeatureNames.cpp b/Source/WebCore/css/MediaFeatureNames.cpp index 73a0ba351..18430c90c 100644 --- a/Source/WebCore/css/MediaFeatureNames.cpp +++ b/Source/WebCore/css/MediaFeatureNames.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005 Apple Computer, Inc. + * Copyright (C) 2005 Apple Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -30,8 +30,7 @@ namespace WebCore { namespace MediaFeatureNames { -#define DEFINE_MEDIAFEATURE_GLOBAL(name, str) \ - DEFINE_GLOBAL(AtomicString, name##MediaFeature, str) +#define DEFINE_MEDIAFEATURE_GLOBAL(name, string) DEFINE_GLOBAL(AtomicString, name) CSS_MEDIAQUERY_NAMES_FOR_EACH_MEDIAFEATURE(DEFINE_MEDIAFEATURE_GLOBAL) #undef DEFINE_MEDIAFEATURE_GLOBAL @@ -39,10 +38,9 @@ void init() { static bool initialized; if (!initialized) { - // Use placement new to initialize the globals. - + // Use placement new to initialize the globals. AtomicString::init(); -#define INITIALIZE_GLOBAL(name, str) new (NotNull, (void*)&name##MediaFeature) AtomicString(str, AtomicString::ConstructFromLiteral); +#define INITIALIZE_GLOBAL(name, string) new (NotNull, (void*)&name) AtomicString(string, AtomicString::ConstructFromLiteral); CSS_MEDIAQUERY_NAMES_FOR_EACH_MEDIAFEATURE(INITIALIZE_GLOBAL) #undef INITIALIZE_GLOBAL initialized = true; -- cgit v1.2.1