Temporary debug loggin

Author: gspencergoog

shell/platform/windows/key_event_handler.cc

@@ -30,25 +30,25 @@ namespace flutter {
 // These have to be in sync with the framework's RawKeyEventDataWindows
 // modifiers definition.
 // https://github.com/flutter/flutter/blob/19ff596979e407c484a32f4071420fca4f4c885f/packages/flutter/lib/src/services/raw_keyboard_windows.dart#L203
-static constexpr int kShift = 1 << 0;
-static constexpr int kShiftLeft = 1 << 1;
-static constexpr int kShiftRight = 1 << 2;
-static constexpr int kControl = 1 << 3;
-static constexpr int kControlLeft = 1 << 4;
-static constexpr int kControlRight = 1 << 5;
-static constexpr int kAlt = 1 << 6;
-static constexpr int kAltLeft = 1 << 7;
-static constexpr int kAltRight = 1 << 8;
-static constexpr int kWinLeft = 1 << 9;
-static constexpr int kWinRight = 1 << 10;
-static constexpr int kCapsLock = 1 << 11;
-static constexpr int kNumLock = 1 << 12;
-static constexpr int kScrollLock = 1 << 13;
+constexpr int kShift = 1 << 0;
+constexpr int kShiftLeft = 1 << 1;
+constexpr int kShiftRight = 1 << 2;
+constexpr int kControl = 1 << 3;
+constexpr int kControlLeft = 1 << 4;
+constexpr int kControlRight = 1 << 5;
+constexpr int kAlt = 1 << 6;
+constexpr int kAltLeft = 1 << 7;
+constexpr int kAltRight = 1 << 8;
+constexpr int kWinLeft = 1 << 9;
+constexpr int kWinRight = 1 << 10;
+constexpr int kCapsLock = 1 << 11;
+constexpr int kNumLock = 1 << 12;
+constexpr int kScrollLock = 1 << 13;
 
 // A sentinel value for the extra data on key events synthesized by this code.
 // This is used to prevent sending a synthesized event to the framework a second
 // time.
-static constexpr int kSynthesizedEvent = 0xbaddecaf;
+constexpr int kSynthesizedEvent = 0xbaddecaf;
 
 namespace {
 /// Calls GetKeyState() an all modifier keys and packs the result in an int,

shell/platform/windows/testing/win32_window_test.cc

@@ -0,0 +1,40 @@
+#include "flutter/shell/platform/windows/testing/win32_window_test.h"
+
+namespace flutter {
+namespace testing {
+
+Win32WindowTest::Win32WindowTest() : Win32Window(){};
+
+Win32WindowTest::~Win32WindowTest() = default;
+
+void Win32WindowTest::OnDpiScale(unsigned int dpi){};
+
+void Win32WindowTest::OnResize(unsigned int width, unsigned int height) {}
+
+void Win32WindowTest::OnPointerMove(double x, double y) {}
+
+void Win32WindowTest::OnPointerDown(double x, double y, UINT button) {}
+
+void Win32WindowTest::OnPointerUp(double x, double y, UINT button) {}
+
+void Win32WindowTest::OnPointerLeave() {}
+
+void Win32WindowTest::OnSetCursor() {}
+
+void Win32WindowTest::OnText(const std::u16string& text) {}
+
+void Win32WindowTest::OnKey(int key,
+                            int scancode,
+                            int action,
+                            char32_t character) {}
+
+void Win32WindowTest::OnScroll(double delta_x, double delta_y) {}
+
+void Win32WindowTest::OnFontChange() {}
+
+UINT Win32WindowTest::GetDpi() {
+  return GetCurrentDPI();
+}
+
+}  // namespace testing
+}  // namespace flutter

shell/platform/windows/testing/win32_window_test.h

@@ -0,0 +1,61 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <windowsx.h>
+
+#include "flutter/shell/platform/windows/win32_window.h"
+
+namespace flutter {
+namespace testing {
+
+/// Test class for the Win32Window base class. Used to access protected methods
+/// for testing.
+class Win32WindowTest : public Win32Window {
+ public:
+  Win32WindowTest();
+  virtual ~Win32WindowTest();
+
+  // Prevent copying.
+  Win32WindowTest(Win32WindowTest const&) = delete;
+  Win32WindowTest& operator=(Win32WindowTest const&) = delete;
+
+  // Wrapper for GetCurrentDPI() which is a protected method.
+  UINT GetDpi();
+
+  // |Win32Window|
+  void OnDpiScale(unsigned int dpi) override;
+
+  // |Win32Window|
+  void OnResize(unsigned int width, unsigned int height) override;
+
+  // |Win32Window|
+  void OnPointerMove(double x, double y) override;
+
+  // |Win32Window|
+  void OnPointerDown(double x, double y, UINT button) override;
+
+  // |Win32Window|
+  void OnPointerUp(double x, double y, UINT button) override;
+
+  // |Win32Window|
+  void OnPointerLeave() override;
+
+  // |Win32Window|
+  void OnSetCursor() override;
+
+  // |Win32Window|
+  void OnText(const std::u16string& text) override;
+
+  // |Win32Window|
+  void OnKey(int key, int scancode, int action, char32_t character) override;
+
+  // |Win32Window|
+  void OnScroll(double delta_x, double delta_y) override;
+
+  // |Win32Window|
+  void OnFontChange() override;
+};
+
+}  // namespace testing
+}  // namespace flutter

shell/platform/windows/win32_window.cc

@@ -5,6 +5,7 @@
 #include "flutter/shell/platform/windows/win32_window.h"
 
 #include <cstring>
+#include <iostream>
 
 #include "win32_dpi_utils.h"
 
@@ -119,8 +120,7 @@ Win32Window::HandleMessage(UINT const message,
   LPARAM extraInfo = GetMessageExtraInfo();
   if (extraInfo == 0xbaddecaf) {
     // Don't pass messages that we synthesized to the framework again.
-    std::cerr << "Found Extra Info synthesized key for scancode " << scancode << " ("
-              << character << ")" << std::endl;
+    std::cerr << "Found Extra Info for synthesized key" << std::endl;
   }
 
   switch (message) {