Igalia / chromium

Old repo. See https://crbug.com/578890 instead.
https://chromium.googlesource.com/chromium/src.git
BSD 3-Clause "New" or "Revised" License
115 stars 16 forks source link

fixup! Implements Drag and Drop for Ozone/X11 #495

Closed nickdiego closed 5 years ago

nickdiego commented 5 years ago

Fix the following build error after 14a5ed748f6dab89:

[5/30693] CXX obj/ui/ozone/demo/ozone_demo/ozone_demo.o
FAILED: obj/ui/ozone/demo/ozone_demo/ozone_demo.o 
ccache ../../../third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF obj/ui/ozone/demo/ozone_demo/ozone_demo.o.d -DV8_DEPRECATION_WARNINGS -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DCHROMIUM_BUILD -DFIELDTRIAL_TESTING_ENABLED -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -DCR_CLANG_REVISION=\"343342-1\" -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS -DCR_LIBCXX_REVISION=332543 -DCR_LIBCXXABI_REVISION=331450 -DCR_SYSROOT_HASH=815a8c22f8657fe57d02e2c2d893bcdc25a243cf -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DWEBP_EXTERN=extern -DGL_GLEXT_PROTOTYPES -DUSE_GLX -DUSE_EGL -DVK_NO_PROTOTYPES -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_HAS_PNG_LIBRARY -DSK_HAS_WEBP_LIBRARY -DSK_HAS_JPEG_LIBRARY -DSK_VULKAN_HEADER=\"../../skia/config/SkVulkanConfig.h\" -DSK_VULKAN=1 -DSK_SUPPORT_GPU=1 -DSK_GPU_WORKAROUNDS_HEADER=\"gpu/config/gpu_driver_bug_workaround_autogen.h\" -DVK_NO_PROTOTYPES -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DUSE_CHROMIUM_ICU=1 -DU_STATIC_IMPLEMENTATION -DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE -DUCHAR_TYPE=uint16_t -DGOOGLE_PROTOBUF_NO_RTTI -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DHAVE_PTHREAD -I../../.. -Igen -I../../../third_party/libwebp/src -I../../../third_party/vulkan/include -I../../../third_party/khronos -I../../../gpu -I../../../third_party/mesa_headers -I../../../skia/config -I../../../skia/ext -I../../../third_party/skia/include/c -I../../../third_party/skia/include/config -I../../../third_party/skia/include/core -I../../../third_party/skia/include/docs -I../../../third_party/skia/include/effects -I../../../third_party/skia/include/encode -I../../../third_party/skia/include/gpu -I../../../third_party/skia/include/pathops -I../../../third_party/skia/include/ports -I../../../third_party/skia/include/utils -I../../../third_party/vulkan/include -I../../../third_party/skia/third_party/vulkanmemoryallocator -I../../../third_party/skia/include/codec -I../../../third_party/skia/src/gpu -I../../../third_party/skia/src/sksl -I../../../third_party/skia/modules/skottie/include -I../../../third_party/vulkan/include -I../../../third_party/icu/source/common -I../../../third_party/icu/source/i18n -I../../../third_party/ced/src -I../../../third_party/protobuf/src -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -Wno-builtin-macro-redefined -D__DATE__= -D__TIME__= -D__TIMESTAMP__= -funwind-tables -fPIC -B../../../third_party/binutils/Linux_x64/Release/bin -pthread -fcolor-diagnostics -fmerge-all-constants -Xclang -mllvm -Xclang -instcombine-lower-dbg-declare=0 -no-canonical-prefixes -fcomplete-member-pointers -m64 -march=x86-64 -Wall -Werror -Wextra -Wimplicit-fallthrough -Wthread-safety -Wno-missing-field-initializers -Wno-unused-parameter -Wno-c++11-narrowing -Wno-covered-switch-default -Wno-unneeded-internal-declaration -Wno-undefined-var-template -Wno-nonportable-include-path -Wno-user-defined-warnings -Wno-unused-lambda-capture -Wno-null-pointer-arithmetic -Wno-enum-compare-switch -Wno-ignored-pragma-optimize -Wno-defaulted-function-deleted -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g0 -fvisibility=hidden -Xclang -load -Xclang ../../../third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.so -Xclang -add-plugin -Xclang find-bad-constructs -Xclang -plugin-arg-find-bad-constructs -Xclang enforce-in-thirdparty-webkit -Xclang -plugin-arg-find-bad-constructs -Xclang check-enum-max-value -Xclang -plugin-arg-find-bad-constructs -Xclang check-ipc -Wheader-hygiene -Wstring-conversion -Wtautological-overlap-compare -Wno-shorten-64-to-32 -std=c++14 -fno-exceptions -fno-rtti -nostdinc++ -isystem../../../buildtools/third_party/libc++/trunk/include -isystem../../../buildtools/third_party/libc++abi/trunk/include --sysroot=../../../build/linux/debian_sid_amd64-sysroot -fvisibility-inlines-hidden -c ../../../ui/ozone/demo/ozone_demo.cc -o obj/ui/ozone/demo/ozone_demo/ozone_demo.o
In file included from ../../../ui/ozone/demo/ozone_demo.cc:20:
../../../ui/ozone/demo/window_manager.h:55:35: error: only virtual member functions can be marked 'override'
                   int operation) override;
                                  ^~~~~~~~
../../../ui/ozone/demo/window_manager.h:59:52: error: only virtual member functions can be marked 'override'
                   gfx::AcceleratedWidget* widget) override;
                                                   ^~~~~~~~
../../../ui/ozone/demo/window_manager.h:60:61: error: only virtual member functions can be marked 'override'
  void OnDragDrop(std::unique_ptr<ui::OSExchangeData> data) override;
                                                            ^~~~~~~~
../../../ui/ozone/demo/window_manager.h:61:22: error: only virtual member functions can be marked 'override'
  void OnDragLeave() override;
                     ^~~~~~~~
../../../ui/ozone/demo/window_manager.h:63:53: error: only virtual member functions can be marked 'override'
                    gfx::AcceleratedWidget* widget) override;
                                                    ^~~~~~~~
5 errors generated.
[6/30693] CXX obj/ui/ozone/demo/skia_demo/skia_demo.o
jkim-julie commented 5 years ago

Thanks for fixing it. lgtm.

nickdiego commented 5 years ago

Thanks @jkim-julie .

Just out of curiosity, why aren't you getting these kind of build errors? Are you using some other specfic build target for development flow (rather than 'chrome') ?

jkim-julie commented 5 years ago

Hi, @nickdiego, This repository is mainly targeted to Chromium/Wayland as described on 'README.md' and we rebase the code weekly from upstream. As we upstream our changes as much as possible and the patch is updated while getting a review, it could cause general interfaces change. The build error you recently fixed was caused by that reason. Even if we have a buildbot, check build error and run some unittests, it's verified on Chromium/Wayland port. Now, the interfaces added for Drag and Drop will not affect any other port any more as we take more flexible design. Sorry for the inconvenience. Welcome contributions and reporting issues.