summaryrefslogtreecommitdiffstats
path: root/WebCore
diff options
context:
space:
mode:
authorPatrick Scott <phanna@android.com>2010-12-13 09:37:23 -0500
committerPatrick Scott <phanna@android.com>2010-12-13 09:37:23 -0500
commit1c7e3bbce2bc24e682120ae13612079374078340 (patch)
tree36217a7e321a9aa9a201b8221db80196d1468628 /WebCore
parentfe812d40b53dc52d5c929e39b5e293af8b6cb4e4 (diff)
downloadexternal_webkit-1c7e3bbce2bc24e682120ae13612079374078340.zip
external_webkit-1c7e3bbce2bc24e682120ae13612079374078340.tar.gz
external_webkit-1c7e3bbce2bc24e682120ae13612079374078340.tar.bz2
Fix crash with meta data settings
Bug: 3275740 Change-Id: I6a65bdd52a3d044ee9a18c690930ca884a1baec1
Diffstat (limited to 'WebCore')
-rw-r--r--WebCore/html/HTMLMetaElement.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/WebCore/html/HTMLMetaElement.cpp b/WebCore/html/HTMLMetaElement.cpp
index 520b9ae..4863f3b 100644
--- a/WebCore/html/HTMLMetaElement.cpp
+++ b/WebCore/html/HTMLMetaElement.cpp
@@ -86,6 +86,7 @@ void HTMLMetaElement::process()
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");