Attachment #133509 for bug #81940

View Details Raw Unified Return to Bug 81940

| Differences between



2012-03-23  Terry Anderson  <tdanderson@chromium.org>

        [chromium] Allow the viewport meta tag to be disabled for testing purposes
        https://bugs.webkit.org/show_bug.cgi?id=81940

        Reviewed by NOBODY (OOPS!).

        * public/WebSettings.h:
        * src/ChromeClientImpl.cpp:
        (WebKit::ChromeClientImpl::dispatchViewportPropertiesDidChange):
        * src/WebSettingsImpl.cpp:
        (WebKit::WebSettingsImpl::WebSettingsImpl):
        (WebKit::WebSettingsImpl::setViewportEnabled):
        (WebKit):
        * src/WebSettingsImpl.h:
        (WebSettingsImpl):
        (WebKit::WebSettingsImpl::viewportEnabled):

2012-03-23  Jonathan Backer  <backer@chromium.org>

        [chromium] Remove unused variables from unittest.

Lines 145-150 public: a/Source/WebKit/chromium/public/WebSettings.h_sec1
- a/Source/WebKit/chromium/public/WebSettings.h +2 lines
145	virtual void setPerTilePaintingEnabled(bool) = 0;	145	virtual void setPerTilePaintingEnabled(bool) = 0;
146	virtual void setPartialSwapEnabled(bool) = 0;	146	virtual void setPartialSwapEnabled(bool) = 0;
147	virtual void setThreadedAnimationEnabled(bool) = 0;	147	virtual void setThreadedAnimationEnabled(bool) = 0;
		148	virtual void setViewportEnabled(bool) = 0;
		149	virtual bool viewportEnabled() const = 0;
148		150
149	protected:	151	protected:
150	~WebSettings() { }	152	~WebSettings() { }

Lines 639-645 void ChromeClientImpl::setToolTip(const String& tooltipText, TextDirection dir) a/Source/WebKit/chromium/src/ChromeClientImpl.cpp_sec1
- a/Source/WebKit/chromium/src/ChromeClientImpl.cpp -1 / +1 lines
639	void ChromeClientImpl::dispatchViewportPropertiesDidChange(const ViewportArguments& arguments) const	639	void ChromeClientImpl::dispatchViewportPropertiesDidChange(const ViewportArguments& arguments) const
640	{	640	{
641	#if ENABLE(VIEWPORT)	641	#if ENABLE(VIEWPORT)
642	if (!m_webView->isFixedLayoutModeEnabled() \|\| !m_webView->client() \|\| !m_webView->page())	642	if (!m_webView->settings()->viewportEnabled() \|\| !m_webView->isFixedLayoutModeEnabled() \|\| !m_webView->client() \|\| !m_webView->page())
643	return;	643	return;
644		644
645	ViewportArguments args;	645	ViewportArguments args;

Lines 50-55 WebSettingsImpl::WebSettingsImpl(Settings* settings) a/Source/WebKit/chromium/src/WebSettingsImpl.cpp_sec1
- a/Source/WebKit/chromium/src/WebSettingsImpl.cpp +6 lines
50	, m_compositeToTextureEnabled(false)	50	, m_compositeToTextureEnabled(false)
51	, m_showFPSCounter(false)	51	, m_showFPSCounter(false)
52	, m_showPlatformLayerTree(false)	52	, m_showPlatformLayerTree(false)
		53	, m_viewportEnabled(false)
53	{	54	{
54	ASSERT(settings);	55	ASSERT(settings);
55	}	56	}
Lines 558-561 void WebSettingsImpl::setThreadedAnimationEnabled(bool enabled) a/Source/WebKit/chromium/src/WebSettingsImpl.cpp_sec2
558	m_settings->setThreadedAnimationEnabled(enabled);	559	m_settings->setThreadedAnimationEnabled(enabled);
559	}	560	}
560		561
		562	void WebSettingsImpl::setViewportEnabled(bool enabled)
		563	{
		564	m_viewportEnabled = enabled;
		565	}
		566
561	} // namespace WebKit	567	} // namespace WebKit

Lines 140-151 public: a/Source/WebKit/chromium/src/WebSettingsImpl.h_sec1
- a/Source/WebKit/chromium/src/WebSettingsImpl.h +3 lines
140	virtual void setPerTilePaintingEnabled(bool);	140	virtual void setPerTilePaintingEnabled(bool);
141	virtual void setPartialSwapEnabled(bool);	141	virtual void setPartialSwapEnabled(bool);
142	virtual void setThreadedAnimationEnabled(bool);	142	virtual void setThreadedAnimationEnabled(bool);
		143	virtual void setViewportEnabled(bool);
		144	virtual bool viewportEnabled() const { return m_viewportEnabled; }
143		145
144	private:	146	private:
145	WebCore::Settings* m_settings;	147	WebCore::Settings* m_settings;
146	bool m_compositeToTextureEnabled;	148	bool m_compositeToTextureEnabled;
147	bool m_showFPSCounter;	149	bool m_showFPSCounter;
148	bool m_showPlatformLayerTree;	150	bool m_showPlatformLayerTree;
		151	bool m_viewportEnabled;
149	};	152	};
150		153
151	} // namespace WebKit	154	} // namespace WebKit

Return to Bug 81940

Lines 1-3 a/Source/WebKit/chromium/ChangeLog_sec1
- a/Source/WebKit/chromium/ChangeLog +18 lines
		1	2012-03-23 Terry Anderson <tdanderson@chromium.org>
		2
		3	[chromium] Allow the viewport meta tag to be disabled for testing purposes
		4	https://bugs.webkit.org/show_bug.cgi?id=81940
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* public/WebSettings.h:
		9	* src/ChromeClientImpl.cpp:
		10	(WebKit::ChromeClientImpl::dispatchViewportPropertiesDidChange):
		11	* src/WebSettingsImpl.cpp:
		12	(WebKit::WebSettingsImpl::WebSettingsImpl):
		13	(WebKit::WebSettingsImpl::setViewportEnabled):
		14	(WebKit):
		15	* src/WebSettingsImpl.h:
		16	(WebSettingsImpl):
		17	(WebKit::WebSettingsImpl::viewportEnabled):
		18
1	2012-03-23 Jonathan Backer <backer@chromium.org>	19	2012-03-23 Jonathan Backer <backer@chromium.org>
2		20
3	[chromium] Remove unused variables from unittest.	21	[chromium] Remove unused variables from unittest.