diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2011-07-01 17:06:05 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-01 17:06:05 -0700 |
| commit | 84373792909396d36824255d643e86b3d3a2f28a (patch) | |
| tree | bb4ff022d2de0702d3b6c36a75f6bd97c6a058af /Source/WebCore/html | |
| parent | b18e666e226b16a009467f4c330cf66aa46f55d4 (diff) | |
| parent | 94bd391238210e19ce80d03518fafab7d6d939b0 (diff) | |
| download | external_webkit-84373792909396d36824255d643e86b3d3a2f28a.zip external_webkit-84373792909396d36824255d643e86b3d3a2f28a.tar.gz external_webkit-84373792909396d36824255d643e86b3d3a2f28a.tar.bz2 | |
Merge "meta format-detection is not a viewport meta tag."
Diffstat (limited to 'Source/WebCore/html')
| -rw-r--r-- | Source/WebCore/html/HTMLMetaElement.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/html/HTMLMetaElement.cpp b/Source/WebCore/html/HTMLMetaElement.cpp index 493d4ac..cb7f4c0 100644 --- a/Source/WebCore/html/HTMLMetaElement.cpp +++ b/Source/WebCore/html/HTMLMetaElement.cpp @@ -80,7 +80,7 @@ void HTMLMetaElement::process() #ifdef ANDROID_META_SUPPORT // TODO: Evaluate whether to take upstreamed meta support else if (equalIgnoringCase(name(), "format-detection")) - document()->processViewport(m_content); + document()->processMetadataSettings(m_content); else if (((equalIgnoringCase(name(), "HandheldFriendly") && equalIgnoringCase(m_content, "true")) || equalIgnoringCase(name(), "MobileOptimized")) && document()->settings() && document()->settings()->viewportWidth() == -1) { |