Landing requested on , by spohl@mozilla.com.
Landing Job:
117309
Revisions:
D337342
diff 1434753
←
D337857
diff 1421050
While applying revision D337857 to firefox-autoland, the following files had
conflicts:
(Hint: try rebasing your changes on the latest commits from firefox-autoland and re-submitting.)
-
widget/cocoa/nsMenuItemX.mm @ c092b556246630b91161c616724c07f00853eb9e
diff a/widget/cocoa/nsMenuItemX.mm b/widget/cocoa/nsMenuItemX.mm (rejected hunks)
@@ -417,10 +422,28 @@
...
diff a/widget/cocoa/nsMenuItemX.mm b/widget/cocoa/nsMenuItemX.mm (rejected hunks)
@@ -417,10 +422,28 @@
CopyUserKeyEquivalentToKeyElement();
NS_OBJC_END_TRY_ABORT_BLOCK;
}
+bool nsMenuItemX::HasInternalShortcut() {
+ if (!mKeyElement) {
+ return false;
+ }
+ dom::Element* handlerElement = mKeyElement;
+ nsAutoString command;
+ mKeyElement->GetAttr(nsGkAtoms::command, command);
+ if (!command.IsEmpty()) {
+ dom::Document* document = mKeyElement->GetUncomposedDoc();
+ handlerElement = document ? document->GetElementById(command) : nullptr;
+ if (!handlerElement) {
+ return false;
+ }
+ }
+ return handlerElement->AttrValueIs(kNameSpaceID_None, nsGkAtoms::internal,
+ nsGkAtoms::_true, eCaseMatters);
+}
+
void nsMenuItemX::CopyUserKeyEquivalentToKeyElement() {
if (mType == eSeparatorMenuItemType || !mNativeMenuItem.menu) {
return;
}
nsMenuGroupOwnerX::CopyUserKeyEquivalentToKeyElement(mNativeMenuItem,
in addition, Git reported this error: while searching for:
CopyUserKeyEquivalentToKeyElement();
NS_OBJC_END_TRY_ABORT_BLOCK;
}
void nsMenuItemX::CopyUserKeyEquivalentToKeyElement() {
if (mType == eSeparatorMenuItemType || !mNativeMenuItem.menu) {
return;
}
nsMenuGroupOwnerX::CopyUserKeyEquivalentToKeyElement(mNativeMenuItem,
Last update:
Raw error output:
Problem while applying patch in revision 337857:
Checking patch widget/cocoa/nsMenuItemX.mm...
error: while searching for:
CopyUserKeyEquivalentToKeyElement();
NS_OBJC_END_TRY_ABORT_BLOCK;
}
void nsMenuItemX::CopyUserKeyEquivalentToKeyElement() {
if (mType == eSeparatorMenuItemType || !mNativeMenuItem.menu) {
return;
}
nsMenuGroupOwnerX::CopyUserKeyEquivalentToKeyElement(mNativeMenuItem,
error: patch failed: widget/cocoa/nsMenuItemX.mm:417
Checking patch widget/cocoa/nsMenuItemX.h...
Checking patch widget/cocoa/nsMenuBarX.mm...
Applying patch widget/cocoa/nsMenuItemX.mm with 1 reject...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Rejected hunk #3.
Applied patch widget/cocoa/nsMenuItemX.h cleanly.
Applied patch widget/cocoa/nsMenuBarX.mm cleanly.