| 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 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 #endif | 25 #endif |
| 26 | 26 |
| 27 #include "core/css/MediaFeatureNames.h" | 27 #include "core/css/MediaFeatureNames.h" |
| 28 | 28 |
| 29 #include "wtf/StaticConstructors.h" | 29 #include "wtf/StaticConstructors.h" |
| 30 | 30 |
| 31 namespace WebCore { | 31 namespace WebCore { |
| 32 namespace MediaFeatureNames { | 32 namespace MediaFeatureNames { |
| 33 | 33 |
| 34 #define DEFINE_MEDIAFEATURE_GLOBAL(name, str) \ | 34 #define DEFINE_MEDIAFEATURE_GLOBAL(name, str) \ |
| 35 DEFINE_GLOBAL(AtomicString, name##MediaFeature, str) | 35 DEFINE_GLOBAL(String, name##MediaFeature, str) |
| 36 CSS_MEDIAQUERY_NAMES_FOR_EACH_MEDIAFEATURE(DEFINE_MEDIAFEATURE_GLOBAL) | 36 CSS_MEDIAQUERY_NAMES_FOR_EACH_MEDIAFEATURE(DEFINE_MEDIAFEATURE_GLOBAL) |
| 37 #undef DEFINE_MEDIAFEATURE_GLOBAL | 37 #undef DEFINE_MEDIAFEATURE_GLOBAL |
| 38 | 38 |
| 39 void init() | 39 void init() |
| 40 { | 40 { |
| 41 #define INITIALIZE_GLOBAL(name, str) new (NotNull, (void*)&name##MediaFeature) A
tomicString(str, AtomicString::ConstructFromLiteral); | 41 #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) | 42 CSS_MEDIAQUERY_NAMES_FOR_EACH_MEDIAFEATURE(INITIALIZE_GLOBAL) |
| 43 #undef INITIALIZE_GLOBAL | 43 #undef INITIALIZE_GLOBAL |
| 44 } | 44 } |
| 45 | 45 |
| 46 } // namespace MediaFeatureNames | 46 } // namespace MediaFeatureNames |
| 47 } // namespace WebCore | 47 } // namespace WebCore |
| OLD | NEW |