| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2005 Apple Computer, Inc. | 2 * Copyright (C) 2005 Apple Computer, Inc. |
| 3 * | 3 * |
| 4 * This library is free software; you can redistribute it and/or | 4 * This library is free software; you can redistribute it and/or |
| 5 * modify it under the terms of the GNU Library General Public | 5 * modify it under the terms of the GNU Library General Public |
| 6 * License as published by the Free Software Foundation; either | 6 * License as published by the Free Software Foundation; either |
| 7 * version 2 of the License, or (at your option) any later version. | 7 * version 2 of the License, or (at your option) any later version. |
| 8 * | 8 * |
| 9 * This library is distributed in the hope that it will be useful, | 9 * This library is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 12 * Library General Public License for more details. | 12 * Library General Public License for more details. |
| 13 * | 13 * |
| 14 * You should have received a copy of the GNU Library General Public License | 14 * You should have received a copy of the GNU Library General Public License |
| 15 * along with this library; see the file COPYING.LIB. If not, write to | 15 * along with this library; see the file COPYING.LIB. If not, write to |
| 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 17 * Boston, MA 02110-1301, USA. | 17 * Boston, MA 02110-1301, USA. |
| 18 * | 18 * |
| 19 */ | 19 */ |
| 20 | 20 |
| 21 #include "config.h" | 21 #include "config.h" |
| 22 | 22 |
| 23 #ifdef SKIP_STATIC_CONSTRUCTORS_ON_GCC | 23 #ifdef SKIP_STATIC_CONSTRUCTORS_ON_GCC |
| 24 #define CSS_MEDIAQUERY_NAMES_HIDE_GLOBALS 1 | 24 #define CSS_MEDIAQUERY_NAMES_HIDE_GLOBALS 1 |
| 25 #endif | 25 #endif |
| 26 | 26 |
| 27 #include "core/css/MediaFeatureNames.h" | 27 #include "core/css/MediaFeatureNames.h" |
| 28 | 28 |
| 29 #include "core/html/parser/HTMLParserIdioms.h" |
| 29 #include "wtf/StaticConstructors.h" | 30 #include "wtf/StaticConstructors.h" |
| 30 | 31 |
| 31 namespace WebCore { | 32 namespace WebCore { |
| 32 namespace MediaFeatureNames { | 33 namespace MediaFeatureNames { |
| 33 | 34 |
| 34 #define DEFINE_MEDIAFEATURE_GLOBAL(name, str) \ | 35 #define DEFINE_MEDIAFEATURE_GLOBAL(name, str) \ |
| 35 DEFINE_GLOBAL(AtomicString, name##MediaFeature, str) | 36 DEFINE_GLOBAL(String, name##MediaFeature, str) |
| 36 CSS_MEDIAQUERY_NAMES_FOR_EACH_MEDIAFEATURE(DEFINE_MEDIAFEATURE_GLOBAL) | 37 CSS_MEDIAQUERY_NAMES_FOR_EACH_MEDIAFEATURE(DEFINE_MEDIAFEATURE_GLOBAL) |
| 37 #undef DEFINE_MEDIAFEATURE_GLOBAL | 38 #undef DEFINE_MEDIAFEATURE_GLOBAL |
| 38 | 39 |
| 39 void init() | 40 void init() |
| 40 { | 41 { |
| 41 #define INITIALIZE_GLOBAL(name, str) new (NotNull, (void*)&name##MediaFeature) A
tomicString(str, AtomicString::ConstructFromLiteral); | 42 #define INITIALIZE_GLOBAL(name, str) new (NotNull, (void*)&name##MediaFeature) S
tring(StringImpl::createStatic((char*)str, strlen(str), StringHasher::computeHas
hAndMaskTop8Bits((LChar*)str, strlen(str)))); |
| 42 CSS_MEDIAQUERY_NAMES_FOR_EACH_MEDIAFEATURE(INITIALIZE_GLOBAL) | 43 CSS_MEDIAQUERY_NAMES_FOR_EACH_MEDIAFEATURE(INITIALIZE_GLOBAL) |
| 43 #undef INITIALIZE_GLOBAL | 44 #undef INITIALIZE_GLOBAL |
| 44 } | 45 } |
| 45 | 46 |
| 46 } // namespace MediaFeatureNames | 47 } // namespace MediaFeatureNames |
| 47 } // namespace WebCore | 48 } // namespace WebCore |
| OLD | NEW |