Attachment #148817 for bug #88114

View Details Raw Unified Return to Bug 88114

| Differences between



2012-06-21  Konrad Piascik  <kpiascik@rim.com>

        Don't hardcode target dpi of 160 (it should be 96 on desktop)
        https://bugs.webkit.org/show_bug.cgi?id=88114

        Reviewed by NOBODY (OOPS!).

        This allows embedders to specify the targetDPI and defaults it to 160.
        Desktop embedders can override this to 96 if desired.

        No behavioural changes.

        * dom/ViewportArguments.cpp:
        (WebCore::computeViewportAttributes):
        * dom/ViewportArguments.h:
        (WebCore):

2012-06-20  Hans Wennborg  <hans@chromium.org>

        Speech JavaScript API: SpeechRecognition should hook up with ActiveDOMObject more




namespace WebCore {

ViewportAttributes computeViewportAttributes(ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, int deviceDPI, IntSize visibleViewport, int targetDPI)
// See https://bugs.webkit.org/show_bug.cgi?id=88114
static float targetDPI = 160;

ViewportAttributes computeViewportAttributes(ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, int deviceDPI, IntSize visibleViewport)
{
    ViewportAttributes result;


Lines 114-120 struct ViewportArguments { a/Source/WebCore/dom/ViewportArguments.h_sec1
- a/Source/WebCore/dom/ViewportArguments.h -1 / +1 lines
114	}	114	}
115	};	115	};
116		116
117	ViewportAttributes computeViewportAttributes(ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, int deviceDPI, IntSize visibleViewport);	117	ViewportAttributes computeViewportAttributes(ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, int deviceDPI, IntSize visibleViewport, int targetDPI = 160);
118	void restrictMinimumScaleFactorToViewportSize(ViewportAttributes& result, IntSize visibleViewport);	118	void restrictMinimumScaleFactorToViewportSize(ViewportAttributes& result, IntSize visibleViewport);
119	void restrictScaleFactorToInitialScaleIfNotUserScalable(ViewportAttributes& result);	119	void restrictScaleFactorToInitialScaleIfNotUserScalable(ViewportAttributes& result);
120	float computeMinimumScaleFactorForContentContained(const ViewportAttributes& result, const IntSize& viewportSize, const IntSize& contentSize);	120	float computeMinimumScaleFactorForContentContained(const ViewportAttributes& result, const IntSize& viewportSize, const IntSize& contentSize);

Return to Bug 88114

Lines 41-51 using namespace std; a/Source/WebCore/dom/ViewportArguments.cpp_sec1
- a/Source/WebCore/dom/ViewportArguments.cpp -5 / +1 lines
41		41
42	namespace WebCore {	42	namespace WebCore {
43		43
44	// FIXME: We shouldn't hardcode the targetDPI to 160.	44	ViewportAttributes computeViewportAttributes(ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, int deviceDPI, IntSize visibleViewport, int targetDPI)
45	// See https://bugs.webkit.org/show_bug.cgi?id=88114
46	static float targetDPI = 160;
47
48	ViewportAttributes computeViewportAttributes(ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, int deviceDPI, IntSize visibleViewport)
49	{	45	{
50	ViewportAttributes result;	46	ViewportAttributes result;
51		47

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +17 lines
		1	2012-06-21 Konrad Piascik <kpiascik@rim.com>
		2
		3	Don't hardcode target dpi of 160 (it should be 96 on desktop)
		4	https://bugs.webkit.org/show_bug.cgi?id=88114
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	This allows embedders to specify the targetDPI and defaults it to 160.
		9	Desktop embedders can override this to 96 if desired.
		10
		11	No behavioural changes.
		12
		13	* dom/ViewportArguments.cpp:
		14	(WebCore::computeViewportAttributes):
		15	* dom/ViewportArguments.h:
		16	(WebCore):
		17
1	2012-06-20 Hans Wennborg <hans@chromium.org>	18	2012-06-20 Hans Wennborg <hans@chromium.org>
2		19
3	Speech JavaScript API: SpeechRecognition should hook up with ActiveDOMObject more	20	Speech JavaScript API: SpeechRecognition should hook up with ActiveDOMObject more