  };
  
  #endif // nsColorPicker_h__
-diff --git a/widget/windows/nsScreenManagerWin.cpp b/widget/windows/nsScreenManagerWin.cpp
---- a/widget/windows/nsScreenManagerWin.cpp
-+++ b/widget/windows/nsScreenManagerWin.cpp
-@@ -180,8 +180,22 @@ nsScreenManagerWin::GetSystemDefaultScal
- 
- NS_IMETHODIMP
- nsScreenManagerWin::ScreenForNativeWidget(void *aWidget, nsIScreen **outScreen)
- {
-   HMONITOR mon = MonitorFromWindow((HWND) aWidget, MONITOR_DEFAULTTOPRIMARY);
+diff -r fec90cbfbaad widget/windows/nsScreenManagerWin.cpp
+--- a/widget/windows/nsScreenManagerWin.cpp	Thu Apr 09 22:57:56 2015 -0400
++++ b/widget/windows/nsScreenManagerWin.cpp	Thu Feb 11 17:49:41 2016 +0100
+@@ -185,3 +185,17 @@
    *outScreen = CreateNewScreenObject(mon);
    return NS_OK;
  }

       WSPoint point = GetCharBefore(aNode, aOffset);
       if (point.mTextNode) {
         *outVisNode = point.mTextNode;
         *outVisOffset = point.mOffset + 1;
         if (nsCRT::IsAsciiSpace(point.mChar) || point.mChar == nbsp) {
           *outType = WSType::normalWS;
         } else if (!point.mChar) {
           // MOOSE: not possible?
diff --git a/editor/moz.build b/editor/moz.build
--- a/editor/moz.build
+++ b/editor/moz.build
@@ -13,16 +13,17 @@ DIRS += [
 
 XPIDL_SOURCES += [
     'nsIContentFilter.idl',
     'nsIDocumentStateListener.idl',
     'nsIEditActionListener.idl',
     'nsIEditor.idl',
     'nsIEditorIMESupport.idl',
     'nsIEditorMailSupport.idl',

+  return NS_ERROR_FAILURE;
+}
+
diff -r fec90cbfbaad editor/libeditor/nsHTMLEditor.h
--- a/editor/libeditor/nsHTMLEditor.h	Thu Apr 09 22:57:56 2015 -0400
+++ b/editor/libeditor/nsHTMLEditor.h	Thu Feb 11 17:49:41 2016 +0100
@@ -655,11 +655,13 @@
   nsresult SetInlinePropertyOnNode( nsIDOMNode *aNode,
                                     nsIAtom *aProperty, 
                                     const nsAString *aAttribute,
