wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Recheck media queries when changing text zoom since em units have changed. (Bug 473400) r+sr=bzbarsky

Browse Source
This commit is contained in:
L. David Baron 2009-01-16 13:32:08 -08:00
parent c9b780ffc5
commit 286c54a127
3 changed files with 136 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
layout/base/nsPresContext.h
View File

@ -508,9 +508,16 @@ public:
float TextZoom() { return mTextZoom; }
void SetTextZoom(float aZoom) {
if (aZoom == mTextZoom)
return;
mTextZoom = aZoom;
if (HasCachedStyleData())
if (HasCachedStyleData()) {
// Media queries could have changed since we changed the meaning
// of 'em' units in them.
MediaFeatureValuesChanged(PR_TRUE);
RebuildAllStyleData(NS_STYLE_HINT_REFLOW);
}
}
float GetFullZoom() { return mFullZoom; }

1
layout/style/test/Makefile.in
View File

@ -110,6 +110,7 @@ _TEST_FILES = test_acid3_test46.html \
test_initial_computation.html \
test_initial_storage.html \
test_media_queries.html \
test_media_queries_dynamic.html \
test_media_queries_dynamic_xbl.html \
test_namespace_rule.html \
test_of_type_selectors.xhtml \

127
layout/style/test/test_media_queries_dynamic.html Normal file
View File

@ -0,0 +1,127 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=473400
-->
<head>
<title>Test for Bug 473400</title>
<script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body onload="run()">
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=473400">Mozilla Bug 473400</a>
<iframe id="subdoc" src="about:blank"></iframe>
<div id="content" style="display: none">
</div>
<pre id="test">
<script class="testbody" type="application/javascript; version=1.7">
/** Test for Bug 473400 **/
SimpleTest.waitForExplicitFinish();
function run() {
var subdoc = document.getElementById("subdoc").contentDocument;
var subwin = document.getElementById("subdoc").contentWindow;
var style = subdoc.createElement("style");
style.setAttribute("type", "text/css");
subdoc.getElementsByTagName("head")[0].appendChild(style);
var sheet = style.sheet;
var iframe_style = document.getElementById("subdoc").style;
// Create a style rule and an element now based on the given media
// query "q", and return the computed style that should be passed to
// query_applies to see if that query currently applies.
var n = 0;
function make_query(q) {
var i = ++n;
sheet.insertRule("@media " + q + " { #e" + i + " { text-decoration: underline; } }", sheet.cssRules.length);
var e = subdoc.createElement("div");
e.id = "e" + i;
subdoc.body.appendChild(e);
var cs = subdoc.defaultView.getComputedStyle(e, "");
cs._originalQueryText = q;
return cs;
}
function query_applies(cs) {
return cs.getPropertyValue("text-decoration") == "underline";
}
function should_apply(cs) {
ok(query_applies(cs), cs._originalQueryText + " should apply");
}
function should_not_apply(cs) {
ok(!query_applies(cs), cs._originalQueryText + " should not apply");
}
netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
const CI = Components.interfaces;
var iframe_docshell = subwin.QueryInterface(CI.nsIInterfaceRequestor).getInterface(CI.nsIWebNavigation).QueryInterface(CI.nsIDocShell);
var iframe_mudv = iframe_docshell.contentViewer.QueryInterface(CI.nsIMarkupDocumentViewer);
var content_div = document.getElementById("content");
content_div.style.font = "-moz-initial";
var em_size =
getComputedStyle(content_div, "").fontSize.match(/^(\d+)px$/)[1];
let width_val = 317; // pick two not-too-round numbers
let height_val = 228;
iframe_style.width = width_val + "px";
iframe_style.height = height_val + "px";
var wh_queries = [
make_query("all and (min-width: " +
(Math.ceil(width_val/em_size) + 1) + "em)"),
make_query("all and (min-width: " +
(Math.floor(width_val/em_size) - 1) + "em)"),
make_query("all and (max-width: " +
(Math.ceil(width_val/em_size) + 1) + "em)"),
make_query("all and (max-width: " +
(Math.floor(width_val/em_size) - 1) + "em)"),
make_query("all and (min-width: " +
(Math.ceil(width_val/(em_size*2)) + 1) + "em)"),
make_query("all and (min-width: " +
(Math.floor(width_val/(em_size*2)) - 1) + "em)"),
make_query("all and (max-width: " +
(Math.ceil(width_val/(em_size*2)) + 1) + "em)"),
make_query("all and (max-width: " +
(Math.floor(width_val/(em_size*2)) - 1) + "em)")
];
is(wh_queries[0].fontSize, em_size + "px", "text zoom is 1.0");
should_not_apply(wh_queries[0]);
should_apply(wh_queries[1]);
should_apply(wh_queries[2]);
should_not_apply(wh_queries[3]);
iframe_mudv.textZoom = 2.0;
isnot(wh_queries[0].fontSize, em_size + "px", "text zoom is not 1.0");
should_not_apply(wh_queries[4]);
should_apply(wh_queries[5]);
should_apply(wh_queries[6]);
should_not_apply(wh_queries[7]);
iframe_mudv.textZoom = 1.0;
is(wh_queries[0].fontSize, em_size + "px", "text zoom is 1.0");
is(subwin.innerHeight, 228, "full zoom is 1.0");
should_not_apply(wh_queries[0]);
should_apply(wh_queries[1]);
should_apply(wh_queries[2]);
should_not_apply(wh_queries[3]);
iframe_mudv.fullZoom = 2.0;
isnot(subwin.innerHeight, 228, "full zoom is not 1.0");
should_not_apply(wh_queries[4]);
should_apply(wh_queries[5]);
should_apply(wh_queries[6]);
should_not_apply(wh_queries[7]);
iframe_mudv.fullZoom = 1.0;
is(subwin.innerHeight, 228, "full zoom is 1.0");
SimpleTest.finish();
}
</script>
</pre>
</body>
</html>