Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-11 01:57:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 1ac58452ef7d (bug 1082899) for test_selectioncarets.py failures.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2014-10-23 13:40:41 -04:00
parent ec61506159
commit c457a87994
2 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
layout/generic/nsCanvasFrame.cpp
View File

@ -76,6 +76,11 @@ nsCanvasFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
NS_ENSURE_SUCCESS(rv, rv);
aElements.AppendElement(mTouchCaretElement);
// Add a _moz_anonclass attribute as touch caret selector.
mTouchCaretElement->SetAttribute(NS_LITERAL_STRING("_moz_anonclass"),
NS_LITERAL_STRING("mozTouchCaret"), er);
NS_ENSURE_SUCCESS(er.ErrorCode(), er.ErrorCode());
// Set touch caret to visibility: hidden by default.
nsAutoString classValue;
classValue.AppendLiteral("moz-touchcaret hidden");

46
layout/style/ua.css
View File

@ -309,9 +309,9 @@ parsererror|sourcetext {
font-size: 12pt;
}
:-moz-native-anonymous.moz-touchcaret.moz-touchcaret,
:-moz-native-anonymous.moz-touchcaret.moz-selectioncaret-left,
:-moz-native-anonymous.moz-touchcaret.moz-selectioncaret-right {
div[\_moz_anonclass="mozTouchCaret"].moz-touchcaret,
div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-left,
div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-right {
background-image: url("resource://gre/res/text_caret.png");
position: absolute;
width: 29px;
@ -322,69 +322,69 @@ parsererror|sourcetext {
z-index: 2147483647;
}
:-moz-native-anonymous.moz-touchcaret.moz-selectioncaret-left.tilt {
div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-left.tilt {
background-image: url("resource://gre/res/text_caret_tilt_left.png");
margin-left: -29px;
width: 29px;
}
:-moz-native-anonymous.moz-touchcaret.moz-selectioncaret-right.tilt {
div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-right.tilt {
background-image: url("resource://gre/res/text_caret_tilt_right.png");
margin-left: 0px;
width: 29px;
}
@media (min-resolution: 1.5dppx) {
:-moz-native-anonymous.moz-touchcaret.moz-touchcaret,
:-moz-native-anonymous.moz-touchcaret.moz-selectioncaret-left,
:-moz-native-anonymous.moz-touchcaret.moz-selectioncaret-right {
div[\_moz_anonclass="mozTouchCaret"].moz-touchcaret,
div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-left,
div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-right {
background-image: url("resource://gre/res/text_caret@1.5x.png");
}
:-moz-native-anonymous.moz-touchcaret.moz-selectioncaret-left.tilt {
div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-left.tilt {
background-image: url("resource://gre/res/text_caret_tilt_left@1.5x.png");
}
:-moz-native-anonymous.moz-touchcaret.moz-selectioncaret-right.tilt {
div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-right.tilt {
background-image: url("resource://gre/res/text_caret_tilt_right@1.5x.png");
}
}
@media (min-resolution: 2dppx) {
:-moz-native-anonymous.moz-touchcaret.moz-touchcaret,
:-moz-native-anonymous.moz-touchcaret.moz-selectioncaret-left,
:-moz-native-anonymous.moz-touchcaret.moz-selectioncaret-right {
div[\_moz_anonclass="mozTouchCaret"].moz-touchcaret,
div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-left,
div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-right {
background-image: url("resource://gre/res/text_caret@2x.png");
}
:-moz-native-anonymous.moz-touchcaret.moz-selectioncaret-left.tilt {
div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-left.tilt {
background-image: url("resource://gre/res/text_caret_tilt_left@2x.png");
}
:-moz-native-anonymous.moz-touchcaret.moz-selectioncaret-right.tilt {
div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-right.tilt {
background-image: url("resource://gre/res/text_caret_tilt_right@2x.png");
}
}
@media (min-resolution: 2.25dppx) {
:-moz-native-anonymous.moz-touchcaret.moz-touchcaret,
:-moz-native-anonymous.moz-touchcaret.moz-selectioncaret-left,
:-moz-native-anonymous.moz-touchcaret.moz-selectioncaret-right {
div[\_moz_anonclass="mozTouchCaret"].moz-touchcaret,
div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-left,
div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-right {
background-image: url("resource://gre/res/text_caret@2.25x.png");
}
:-moz-native-anonymous.moz-touchcaret.moz-selectioncaret-left.tilt {
div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-left.tilt {
background-image: url("resource://gre/res/text_caret_tilt_left@2.25x.png");
}
:-moz-native-anonymous.moz-touchcaret.moz-selectioncaret-right.tilt {
div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-right.tilt {
background-image: url("resource://gre/res/text_caret_tilt_right@2.25x.png");
}
}
:-moz-native-anonymous.moz-touchcaret.moz-touchcaret.hidden,
:-moz-native-anonymous.moz-touchcaret.moz-selectioncaret-left.hidden,
:-moz-native-anonymous.moz-touchcaret.moz-selectioncaret-right.hidden {
div[\_moz_anonclass="mozTouchCaret"].moz-touchcaret.hidden,
div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-left.hidden,
div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-right.hidden {
width: 0px;
height: 0px;
margin: 0px;