summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-10-08 11:21:45 +0200
committerCaolán McNamara <caolanm@redhat.com>2018-12-05 13:31:23 +0100
commit9d7897521efd0c37693241e84c562ea32750740e (patch)
tree8debd7e01e6fd1d7bcd7fdd3c69b41313517d630 /sw/source
parenta9d6f0e078e5e6653bd620ddbdbc24de93c7ae51 (diff)
tdf#121778: Work around odd macOS 10.14 graphicsContextWithWindow failure
Although Stephan's original commit message below talks mainly about a unit test, this change helps at least in tdf#121778, too, and possibly other cases. It is interesting that wihout this change, a lot of these warnings are printed before the crash: warn:vcl.quartz:42670:52899343:vcl/quartz/salvd.cxx:312: No context Original commit message: When running on macOS 10.14, both master and libreoffice-6-1 (at least) started to fail CppunitTest_vcl_bitmap_render_test with > /Users/stephan/Software/lo2/core/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx:90: Assertion > Test name: BitmapRenderTest::testTdf113918 > equality assertion failed > - Expected: mcBlueOrIndex: 255, mcGreen: 255, mcRed: 255, mcAlpha: 0 > - Actual : mcBlueOrIndex: 1, mcGreen: 112, mcRed: 15, mcAlpha: 0 in --enable-debug/--enable-dbgutil builds. I tracked that down to the OSL_DEBUG_LEVEL>0--only call to Scheduler::ProcessEventsToIdle in test::BootstrapFixture::setUp (test/source/bootstrapfixture.cxx). If that call is also included in non-debug (i.e., OSL_DEBUG_LEVEL=0) builds, or if it is removed from all builds and instead an unsuspecting [NSApp nextEventMatchingMask: 0 untilDate: nil inMode: NSDefaultRunLoopMode dequeue: NO]; is added directly before the call to pVDev->SetOutputSizePixel(Size(2480, 3508)); at the start of BitmapRenderTest::testTdf113918 (vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx:76), the test always fails. What happens is that, after such a nextEventMatchingMask call done, the call to NSGraphicsContext graphicsContextWithWindow in AquaSalVirtualDevice::SetSize (as called from the SetOutputSizePixel call in the test) returns nil, for unclear reasons. Until those underlying reasons are understood, change the code of SetSize to "fall back to a bitmap context" also in case the graphicsContextWithWindow call returned nil. Reviewed-on: https://gerrit.libreoffice.org/61519 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit e659c6a1857fbb8e5a6e8ff60fe241483eea32dd) Change-Id: I604ebd2c444b58610e4ed73ec70af87b0a08e864 Reviewed-on: https://gerrit.libreoffice.org/64576 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source')
0 files changed, 0 insertions, 0 deletions