Merge pull request #24 from pozdnyakov/fix_the_viewport

Raphael Kubo da Costa · Raphael Kubo da Costa · commit b8fedaf0e6fb · 2014-10-06T18:05:40.000+03:00
Fix the --enable-viewport command line option
diff --git a/Source/web/WebSettingsImpl.cpp b/Source/web/WebSettingsImpl.cpp
@@ -33,6 +33,7 @@
 
 #include "core/frame/Settings.h"
 #include "core/inspector/InspectorController.h"
+#include "platform/RuntimeEnabledFeatures.h"
 #include "platform/graphics/DeferredImageDecoder.h"
 
 #include "public/platform/WebString.h"
@@ -615,6 +616,7 @@ void WebSettingsImpl::setMediaPlaybackRequiresUserGesture(bool required)
 
 void WebSettingsImpl::setViewportEnabled(bool enabled)
 {
+    RuntimeEnabledFeatures::setCSSViewportEnabled(enabled);
     m_settings->setViewportEnabled(enabled);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@`
`33`	`33`
`34`	`34`	`#include "core/frame/Settings.h"`
`35`	`35`	`#include "core/inspector/InspectorController.h"`
	`36`	`+#include "platform/RuntimeEnabledFeatures.h"`
`36`	`37`	`#include "platform/graphics/DeferredImageDecoder.h"`
`37`	`38`
`38`	`39`	`#include "public/platform/WebString.h"`
`@@ -615,6 +616,7 @@ void WebSettingsImpl::setMediaPlaybackRequiresUserGesture(bool required)`
`615`	`616`
`616`	`617`	`void WebSettingsImpl::setViewportEnabled(bool enabled)`
`617`	`618`	`{`
	`619`	`+ RuntimeEnabledFeatures::setCSSViewportEnabled(enabled);`
`618`	`620`	`m_settings->setViewportEnabled(enabled);`
`619`	`621`	`}`
`620`	`622`