diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-08 12:02:30 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-08 12:02:30 -0700 |
| commit | 1203a808ccf7c707a8bb93b2e25e71118f793b18 (patch) | |
| tree | ba29872507139951e9ce4c4a8a1aa82c3c17668b /WebCore/html | |
| parent | 5243907cd493b181a8a5113a59b130c9798c64ba (diff) | |
| parent | ca2fbfb0adeb06991329d7d28854a5166672fe7a (diff) | |
| download | external_webkit-1203a808ccf7c707a8bb93b2e25e71118f793b18.zip external_webkit-1203a808ccf7c707a8bb93b2e25e71118f793b18.tar.gz external_webkit-1203a808ccf7c707a8bb93b2e25e71118f793b18.tar.bz2 | |
Merge change 24042 into eclair
* changes:
Handle another old style meta tag, MobileOptimized. Also if the sites set the width for the viewport to be less than 320, just use device-width.
Diffstat (limited to 'WebCore/html')
| -rw-r--r-- | WebCore/html/HTMLMetaElement.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/WebCore/html/HTMLMetaElement.cpp b/WebCore/html/HTMLMetaElement.cpp index 83e38fe..f90ad0e 100644 --- a/WebCore/html/HTMLMetaElement.cpp +++ b/WebCore/html/HTMLMetaElement.cpp @@ -77,8 +77,9 @@ void HTMLMetaElement::process() updateViewport = true; } else if (equalIgnoringCase(name(), "format-detection")) document()->processMetadataSettings(m_content); - else if (equalIgnoringCase(name(), "HandheldFriendly") - && equalIgnoringCase(m_content, "true") + else if ((equalIgnoringCase(name(), "HandheldFriendly") + && equalIgnoringCase(m_content, "true") || + equalIgnoringCase(name(), "MobileOptimized")) && document()->settings()->viewportWidth() == -1) { // fit mobile sites directly in the screen document()->settings()->setMetadataSettings("width", "device-width"); |