Skip to content

Commit 8bc30af

Browse files
author
Norisz Fay
committed
Backed out 6 changesets (bug 1782578, bug 1782579) for causing mochitest failures on browser_parsable_css.js CLOSED TREE
Backed out changeset bdb42cfe6213 (bug 1782579) Backed out changeset 5f17ee4cc4df (bug 1782578) Backed out changeset 4f969d46dd37 (bug 1782578) Backed out changeset b4c51d1ffa99 (bug 1782578) Backed out changeset 98d0d6bcd37b (bug 1782578) Backed out changeset 8332d678079e (bug 1782578)
1 parent 8274331 commit 8bc30af

31 files changed

+138
-1082
lines changed

browser/actors/ContextMenuChild.jsm

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -167,11 +167,8 @@ class ContextMenuChild extends JSWindowActorChild {
167167
let img = lazy.ContentDOMReference.resolve(
168168
message.data.targetIdentifier
169169
);
170-
const { direction } = this.contentWindow.getComputedStyle(img);
171-
172-
return img.recognizeCurrentImageText().then(results => {
173-
return { results, direction };
174-
});
170+
img.recognizeCurrentImageText();
171+
break;
175172
}
176173

177174
case "ContextMenu:ToggleRevealPassword": {

browser/actors/ContextMenuParent.jsm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class ContextMenuParent extends JSWindowActorParent {
4040
}
4141

4242
getImageText(targetIdentifier) {
43-
return this.sendQuery("ContextMenu:GetImageText", {
43+
this.sendAsyncMessage("ContextMenu:GetImageText", {
4444
targetIdentifier,
4545
});
4646
}

browser/base/content/browser-context.inc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,9 @@
214214
<menuitem id="context-copyimage"
215215
data-l10n-id="main-context-menu-image-copy-link"
216216
oncommand="gContextMenu.copyMediaLocation();"/>
217+
<menuitem id="context-imagetext"
218+
data-l10n-id="main-context-menu-image-get-text"
219+
oncommand="gContextMenu.getImageText()"/>
217220
<menuitem id="context-copyvideourl"
218221
data-l10n-id="main-context-menu-video-copy-link"
219222
oncommand="gContextMenu.copyMediaLocation();"/>
@@ -229,9 +232,6 @@
229232
<menuitem id="context-sendaudio"
230233
data-l10n-id="main-context-menu-audio-email"
231234
oncommand="gContextMenu.sendMedia();"/>
232-
<menuitem id="context-imagetext"
233-
data-l10n-id="main-context-menu-image-copy-text"
234-
oncommand="gContextMenu.getImageText()"/>
235235
<menuitem id="context-viewimageinfo"
236236
hidden="true"
237237
data-l10n-id="main-context-menu-image-info"

browser/base/content/browser.xhtml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
<link rel="localization" href="browser/appmenu.ftl"/>
7575
<link rel="localization" href="browser/panelUI.ftl"/>
7676
<link rel="localization" href="preview/interventions.ftl"/>
77+
<link rel="localization" href="preview/textrecognition.ftl"/>
7778
<link rel="localization" href="browser/sidebarMenu.ftl"/>
7879
<link rel="localization" href="browser/allTabsMenu.ftl"/>
7980
<link rel="localization" href="browser/places.ftl"/>

browser/base/content/nsContextMenu.js

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2301,18 +2301,7 @@ class nsContextMenu {
23012301
}
23022302

23032303
getImageText() {
2304-
let dialogBox = gBrowser.getTabDialogBox(this.browser);
2305-
const imageTextResult = this.actor.getImageText(this.targetIdentifier);
2306-
const { dialog } = dialogBox.open(
2307-
"chrome://browser/content/textrecognition/textrecognition.html",
2308-
{
2309-
features: "resizable=no",
2310-
modalType: Services.prompt.MODAL_TYPE_CONTENT,
2311-
},
2312-
imageTextResult,
2313-
() => dialog.resizeVertically(),
2314-
openLinkIn
2315-
);
2304+
this.actor.getImageText(this.targetIdentifier);
23162305
}
23172306

23182307
drmLearnMore(aEvent) {

browser/components/moz.build

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ DIRS += [
5656
"shell",
5757
"syncedtabs",
5858
"tabunloader",
59-
"textrecognition",
6059
"translation",
6160
"uitour",
6261
"urlbar",

browser/components/textrecognition/moz.build

Lines changed: 0 additions & 14 deletions
This file was deleted.

browser/components/textrecognition/tests/browser/browser.ini

Lines changed: 0 additions & 10 deletions
This file was deleted.

browser/components/textrecognition/tests/browser/browser_textrecognition.js

Lines changed: 0 additions & 79 deletions
This file was deleted.

browser/components/textrecognition/tests/browser/browser_textrecognition_no_result.js

Lines changed: 0 additions & 68 deletions
This file was deleted.

browser/components/textrecognition/tests/browser/head.js

Lines changed: 0 additions & 28 deletions
This file was deleted.
Binary file not shown.

0 commit comments

Comments
 (0)