diff options
| author | Steve Block <steveblock@google.com> | 2011-05-20 09:10:52 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-20 09:10:52 -0700 |
| commit | 483066d710566d4c99077d4d150e4aa72654b97d (patch) | |
| tree | 2f920c687609e6b47b4c5426556295bb1dae6164 /Source/WebCore/html | |
| parent | 41c4de163e4183c0e2a74c5c296de8a734ecc516 (diff) | |
| parent | f2f7d373c9827c5c27771dfda4ca627f173fbe10 (diff) | |
| download | external_webkit-483066d710566d4c99077d4d150e4aa72654b97d.zip external_webkit-483066d710566d4c99077d4d150e4aa72654b97d.tar.gz external_webkit-483066d710566d4c99077d4d150e4aa72654b97d.tar.bz2 | |
Merge changes Ib103214e,Ibc8ca754,I6adc6f64,I4c5fde48,I81552b1b
* changes:
Do not process Inspector.idl using the V8 or JSC code generator
Remove some superfluous ARCHIVE enable guards
Fix WebArchiveAndroid logging
Fix some compiler warnings
Use adoptPtr() and adoptArrayPtr() when setting OwnPtr and OwnArrayPtr
Diffstat (limited to 'Source/WebCore/html')
| -rw-r--r-- | Source/WebCore/html/HTMLMetaElement.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Source/WebCore/html/HTMLMetaElement.cpp b/Source/WebCore/html/HTMLMetaElement.cpp index 4863f3b..d8d9fb3 100644 --- a/Source/WebCore/html/HTMLMetaElement.cpp +++ b/Source/WebCore/html/HTMLMetaElement.cpp @@ -83,11 +83,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") || - equalIgnoringCase(name(), "MobileOptimized")) - && document()->settings() - && document()->settings()->viewportWidth() == -1) { + else if (((equalIgnoringCase(name(), "HandheldFriendly") && equalIgnoringCase(m_content, "true")) || equalIgnoringCase(name(), "MobileOptimized")) + && document()->settings() + && document()->settings()->viewportWidth() == -1) { // fit mobile sites directly in the screen document()->settings()->setMetadataSettings("width", "device-width"); updateViewport = true; |