Remove xfa/src/fwl/src and move code up a level.

xfa/src/fwl/core/fwl_noteimp.cpp

Index: xfa/src/fwl/core/fwl_noteimp.cpp
diff --git a/xfa/src/fwl/src/core/fwl_noteimp.cpp b/xfa/src/fwl/core/fwl_noteimp.cpp
similarity index 95%
rename from xfa/src/fwl/src/core/fwl_noteimp.cpp
rename to xfa/src/fwl/core/fwl_noteimp.cpp
index a4ff5cfb5b69f6ed7aab7f74556282d22ec30a2c..3a46446362e80cb2af01962eef0a25dec1c7adef 100644
--- a/xfa/src/fwl/src/core/fwl_noteimp.cpp
+++ b/xfa/src/fwl/core/fwl_noteimp.cpp
@@ -4,21 +4,21 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fwl/src/core/fwl_noteimp.h"
+#include "xfa/src/fwl/core/fwl_noteimp.h"
 
 #include "core/include/fxcrt/fx_ext.h"
 #include "xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h"
 #include "xfa/include/fwl/basewidget/fwl_tooltipctrl.h"
 #include "xfa/include/fwl/core/fwl_app.h"
 #include "xfa/include/fwl/core/fwl_grid.h"
-#include "xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.h"
-#include "xfa/src/fwl/src/core/fwl_appimp.h"
-#include "xfa/src/fwl/src/core/fwl_formimp.h"
-#include "xfa/src/fwl/src/core/fwl_panelimp.h"
-#include "xfa/src/fwl/src/core/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/fwl_threadimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetmgrimp.h"
+#include "xfa/src/fwl/basewidget/fwl_tooltipctrlimp.h"
+#include "xfa/src/fwl/core/fwl_appimp.h"
+#include "xfa/src/fwl/core/fwl_formimp.h"
+#include "xfa/src/fwl/core/fwl_panelimp.h"
+#include "xfa/src/fwl/core/fwl_targetimp.h"
+#include "xfa/src/fwl/core/fwl_threadimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetmgrimp.h"
 
 CFWL_NoteLoop::CFWL_NoteLoop(CFWL_WidgetImp* pForm)
     : m_pForm(pForm), m_bContinueModal(TRUE) {}
@@ -278,46 +278,46 @@ FWL_ERR CFWL_NoteDriver::Run() {
     }
   }
 #elif(_FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_)
-  FX_BOOL bIdle = TRUE;
-  int32_t iIdleCount = 0;
-  CFWL_NoteLoop* pTopLoop = NULL;
-  for (;;) {
-    pTopLoop = GetTopLoop();
-    if (!pTopLoop || !pTopLoop->ContinueModal()) {
-      break;
-    }
-    if (UnqueueMessage(pTopLoop)) {
-      continue;
-    }
-    while (bIdle && !(pWidgetMgr->CheckMessage_Native())) {
-      if (FWL_ERR_Indefinite == pTopLoop->Idle(iIdleCount++)) {
-        bIdle = FALSE;
+    FX_BOOL bIdle = TRUE;
+    int32_t iIdleCount = 0;
+    CFWL_NoteLoop* pTopLoop = NULL;
+    for (;;) {
+      pTopLoop = GetTopLoop();
+      if (!pTopLoop || !pTopLoop->ContinueModal()) {
+        break;
       }
+      if (UnqueueMessage(pTopLoop)) {
+        continue;
+      }
+      while (bIdle && !(pWidgetMgr->CheckMessage_Native())) {
+        if (FWL_ERR_Indefinite == pTopLoop->Idle(iIdleCount++)) {
+          bIdle = FALSE;
+        }
+      }
+      do {
+        if (FWL_ERR_Indefinite == pWidgetMgr->DispatchMessage_Native()) {
+          break;
+        }
+        if (pWidgetMgr->IsIdleMessage_Native()) {
+          bIdle = TRUE;
+          iIdleCount = 0;
+        }
+      } while (pWidgetMgr->CheckMessage_Native());
     }
-    do {
-      if (FWL_ERR_Indefinite == pWidgetMgr->DispatchMessage_Native()) {
+#elif(_FX_OS_ == _FX_LINUX_DESKTOP_)
+    CFWL_NoteLoop* pTopLoop = NULL;
+    for (;;) {
+      pTopLoop = GetTopLoop();
+      if (!pTopLoop || !pTopLoop->ContinueModal()) {
         break;
       }
-      if (pWidgetMgr->IsIdleMessage_Native()) {
-        bIdle = TRUE;
-        iIdleCount = 0;
+      if (UnqueueMessage(pTopLoop)) {
+        continue;
+      }
+      if (pWidgetMgr->CheckMessage_Native()) {
+        pWidgetMgr->DispatchMessage_Native();
       }
-    } while (pWidgetMgr->CheckMessage_Native());
-  }
-#elif(_FX_OS_ == _FX_LINUX_DESKTOP_)
-  CFWL_NoteLoop* pTopLoop = NULL;
-  for (;;) {
-    pTopLoop = GetTopLoop();
-    if (!pTopLoop || !pTopLoop->ContinueModal()) {
-      break;
-    }
-    if (UnqueueMessage(pTopLoop)) {
-      continue;
-    }
-    if (pWidgetMgr->CheckMessage_Native()) {
-      pWidgetMgr->DispatchMessage_Native();
     }
-  }
 #endif
   return FWL_ERR_Succeeded;
 }