<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>214817</bug_id>
          
          <creation_ts>2020-07-27 00:10:56 -0700</creation_ts>
          <short_desc>[TextureMapper] Crashed in TextureMapperLayer::paintUsingOverlapRegions</short_desc>
          <delta_ts>2020-11-03 12:33:06 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>Platform</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc>http://www.satine.org/research/webkit/snowleopard/snowstack.html</bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Fujii Hironori">fujii</reporter>
          <assigned_to name="Fujii Hironori">fujii</assigned_to>
          <cc>cgarcia</cc>
    
    <cc>cmarcelo</cc>
    
    <cc>don.olmstead</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>kondapallykalyan</cc>
    
    <cc>luiz</cc>
    
    <cc>magomez</cc>
    
    <cc>noam</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>zan</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1675170</commentid>
    <comment_count>0</comment_count>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2020-07-27 00:10:56 -0700</bug_when>
    <thetext>[TextureMapper] Crashed in TextureMapperLayer::paintUsingOverlapRegions

1. Start GTK MiniBrowser
2. Go to http://www.satine.org/research/webkit/snowleopard/snowstack.html
3. Press right arrow key to scroll
4. Crash

Thread 1 (Thread 0x7f1cdffff700 (LWP 61)):
#0  0x00007f1d4ea5f218 in WTFCrash() () at ../../Source/WTF/wtf/Assertions.cpp:295
#1  0x00007f1d5ce7f061 in WTF::CrashOnOverflow::crash() () at DerivedSources/ForwardingHeaders/wtf/CheckedArithmetic.h:127
#2  0x00007f1d5ce7f058 in WTF::CrashOnOverflow::overflowed() () at DerivedSources/ForwardingHeaders/wtf/CheckedArithmetic.h:120
#3  0x00007f1d5dffcfac in WTF::Checked&lt;unsigned int, WTF::CrashOnOverflow&gt;::Checked(WTF::ResultOverflowedTag) (this=0x7f1cdfffa8f0) at DerivedSources/ForwardingHeaders/wtf/CheckedArithmetic.h:658
#4  0x00007f1d5dff9bad in WTF::operator*&lt;unsigned int, int, WTF::CrashOnOverflow&gt;(WTF::Checked&lt;unsigned int, WTF::CrashOnOverflow&gt;, WTF::Checked&lt;int, WTF::CrashOnOverflow&gt;) (lhs=..., rhs=...) at DerivedSources/ForwardingHeaders/wtf/CheckedArithmetic.h:975
#5  0x00007f1d5dff3246 in WTF::operator*&lt;unsigned int, int, WTF::CrashOnOverflow&gt;(WTF::Checked&lt;unsigned int, WTF::CrashOnOverflow&gt;, int) (lhs=..., rhs=156276) at DerivedSources/ForwardingHeaders/wtf/CheckedArithmetic.h:1003
#6  0x00007f1d5dfeec2a in WebCore::IntSize::area&lt;WTF::CrashOnOverflow&gt;() const (this=0x7f1cdfffa940) at DerivedSources/ForwardingHeaders/WebCore/IntSize.h:136
#7  0x00007f1d5e5dbc8d in WebCore::TextureMapperLayer::paintUsingOverlapRegions(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d04265100, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:370
#8  0x00007f1d5e5dcd89 in WebCore::TextureMapperLayer::paintRecursive(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d04265100, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:485
#9  0x00007f1d5e5dac1f in WebCore::TextureMapperLayer::paintSelfAndChildren(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d04264b80, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:241
#10 0x00007f1d5e5daf86 in WebCore::TextureMapperLayer::paintSelfAndChildrenWithReplica(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d04264b80, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:281
#11 0x00007f1d5e5dcd69 in WebCore::TextureMapperLayer::paintRecursive(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d04264b80, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:481
#12 0x00007f1d5e5dac1f in WebCore::TextureMapperLayer::paintSelfAndChildren(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d042ae000, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:241
#13 0x00007f1d5e5daf86 in WebCore::TextureMapperLayer::paintSelfAndChildrenWithReplica(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d042ae000, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:281
#14 0x00007f1d5e5dcd69 in WebCore::TextureMapperLayer::paintRecursive(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d042ae000, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:481
#15 0x00007f1d5e5dac1f in WebCore::TextureMapperLayer::paintSelfAndChildren(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d042b3680, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:241
#16 0x00007f1d5e5daf86 in WebCore::TextureMapperLayer::paintSelfAndChildrenWithReplica(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d042b3680, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:281
#17 0x00007f1d5e5dcd69 in WebCore::TextureMapperLayer::paintRecursive(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d042b3680, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:481
#18 0x00007f1d5e5dac1f in WebCore::TextureMapperLayer::paintSelfAndChildren(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d042b3100, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:241
#19 0x00007f1d5e5daf86 in WebCore::TextureMapperLayer::paintSelfAndChildrenWithReplica(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d042b3100, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:281
#20 0x00007f1d5e5dcd69 in WebCore::TextureMapperLayer::paintRecursive(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d042b3100, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:481
#21 0x00007f1d5e5dac1f in WebCore::TextureMapperLayer::paintSelfAndChildren(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d042b0100, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:241
#22 0x00007f1d5e5daf86 in WebCore::TextureMapperLayer::paintSelfAndChildrenWithReplica(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d042b0100, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:281
#23 0x00007f1d5e5dcd69 in WebCore::TextureMapperLayer::paintRecursive(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d042b0100, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:481
#24 0x00007f1d5e5dac1f in WebCore::TextureMapperLayer::paintSelfAndChildren(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d04274680, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:241
#25 0x00007f1d5e5daf86 in WebCore::TextureMapperLayer::paintSelfAndChildrenWithReplica(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d04274680, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:281
#26 0x00007f1d5e5dcd69 in WebCore::TextureMapperLayer::paintRecursive(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d04274680, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:481
#27 0x00007f1d5e5dac1f in WebCore::TextureMapperLayer::paintSelfAndChildren(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d042b2b80, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:241
#28 0x00007f1d5e5daf86 in WebCore::TextureMapperLayer::paintSelfAndChildrenWithReplica(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d042b2b80, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:281
#29 0x00007f1d5e5dcd69 in WebCore::TextureMapperLayer::paintRecursive(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d042b2b80, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:481
#30 0x00007f1d5e5dac1f in WebCore::TextureMapperLayer::paintSelfAndChildren(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d042b2600, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:241
#31 0x00007f1d5e5daf86 in WebCore::TextureMapperLayer::paintSelfAndChildrenWithReplica(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d042b2600, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:281
#32 0x00007f1d5e5dcd69 in WebCore::TextureMapperLayer::paintRecursive(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d042b2600, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:481
#33 0x00007f1d5e5dac1f in WebCore::TextureMapperLayer::paintSelfAndChildren(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d042ae580, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:241
#34 0x00007f1d5e5daf86 in WebCore::TextureMapperLayer::paintSelfAndChildrenWithReplica(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d042ae580, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:281
#35 0x00007f1d5e5dcd69 in WebCore::TextureMapperLayer::paintRecursive(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d042ae580, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:481
#36 0x00007f1d5e5dac1f in WebCore::TextureMapperLayer::paintSelfAndChildren(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d042b2080, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:241
#37 0x00007f1d5e5daf86 in WebCore::TextureMapperLayer::paintSelfAndChildrenWithReplica(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d042b2080, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:281
#38 0x00007f1d5e5dcd69 in WebCore::TextureMapperLayer::paintRecursive(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d042b2080, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:481
#39 0x00007f1d5e5dac1f in WebCore::TextureMapperLayer::paintSelfAndChildren(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d042b1b00, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:241
#40 0x00007f1d5e5daf86 in WebCore::TextureMapperLayer::paintSelfAndChildrenWithReplica(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d042b1b00, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:281
#41 0x00007f1d5e5dcd69 in WebCore::TextureMapperLayer::paintRecursive(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d042b1b00, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:481
#42 0x00007f1d5e5dac1f in WebCore::TextureMapperLayer::paintSelfAndChildren(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d042b1580, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:241
#43 0x00007f1d5e5daf86 in WebCore::TextureMapperLayer::paintSelfAndChildrenWithReplica(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d042b1580, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:281
#44 0x00007f1d5e5dcd69 in WebCore::TextureMapperLayer::paintRecursive(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d042b1580, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:481
#45 0x00007f1d5e5dac1f in WebCore::TextureMapperLayer::paintSelfAndChildren(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d042b1000, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:241
#46 0x00007f1d5e5daf86 in WebCore::TextureMapperLayer::paintSelfAndChildrenWithReplica(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d042b1000, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:281
#47 0x00007f1d5e5dcd69 in WebCore::TextureMapperLayer::paintRecursive(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d042b1000, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:481
#48 0x00007f1d5e5d9eaf in WebCore::TextureMapperLayer::paint() (this=0x7f1d042b1000) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:137
#49 0x00007f1d5da03623 in WebKit::CoordinatedGraphicsScene::paintToCurrentGLContext(WebCore::TransformationMatrix const&amp;, WebCore::FloatRect const&amp;, unsigned int) (this=0x7f1cfc27e000, matrix=..., clipRect=..., PaintFlags=0) at ../../Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp:79
#50 0x00007f1d5da077ea in WebKit::ThreadedCompositor::renderLayerTree() (this=0x7f1cfc283280) at ../../Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:220
#51 0x00007f1d5da068a7 in WebKit::ThreadedCompositor::&lt;lambda()&gt;::operator()(void) const (__closure=0x7f1cfc293848) at ../../Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:56
#52 0x00007f1d5da0e9b8 in WTF::Detail::CallableWrapper&lt;WebKit::ThreadedCompositor::ThreadedCompositor(WebKit::ThreadedCompositor::Client&amp;, WebKit::ThreadedDisplayRefreshMonitor::Client&amp;, WebCore::PlatformDisplayID, const WebCore::IntSize&amp;, float, WebCore::TextureMapper::PaintFlags)::&lt;lambda()&gt;, void&gt;::call(void) (this=0x7f1cfc293840) at DerivedSources/ForwardingHeaders/wtf/Function.h:52
#53 0x00007f1d5ce82513 in WTF::Function&lt;void ()&gt;::operator()() const (this=0x7f1d4522cc48) at DerivedSources/ForwardingHeaders/wtf/Function.h:83
#54 0x00007f1d5da067d7 in WebKit::CompositingRunLoop::updateTimerFired() (this=0x7f1d4522cc00) at ../../Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp:188
#55 0x00007f1d5da249d2 in WTF::RunLoop::Timer&lt;WebKit::CompositingRunLoop&gt;::fired() (this=0x7f1d4522cc08) at DerivedSources/ForwardingHeaders/wtf/RunLoop.h:173
#56 0x00007f1d4eb1a88b in WTF::RunLoop::TimerBase::&lt;lambda(gpointer)&gt;::operator()(gpointer) const (__closure=0x0, userData=0x7f1d4522cc08) at ../../Source/WTF/wtf/glib/RunLoopGLib.cpp:146
#57 0x00007f1d4eb1a8cb in WTF::RunLoop::TimerBase::&lt;lambda(gpointer)&gt;::_FUN(gpointer) () at ../../Source/WTF/wtf/glib/RunLoopGLib.cpp:150
#58 0x00007f1d4eb1a0ba in WTF::&lt;lambda(GSource*, GSourceFunc, gpointer)&gt;::operator()(GSource *, GSourceFunc, gpointer) const (__closure=0x0, source=0x55ede51ca170, callback=0x7f1d4eb1a8ae &lt;WTF::RunLoop::TimerBase::&lt;lambda(gpointer)&gt;::_FUN(gpointer)&gt;, userData=0x7f1d4522cc08) at ../../Source/WTF/wtf/glib/RunLoopGLib.cpp:45
#59 0x00007f1d4eb1a0ea in WTF::&lt;lambda(GSource*, GSourceFunc, gpointer)&gt;::_FUN(GSource *, GSourceFunc, gpointer) () at ../../Source/WTF/wtf/glib/RunLoopGLib.cpp:46
#60 0x00007f1d47e00c3e in g_main_dispatch (context=0x7f1cd4000b60) at ../glib/gmain.c:3309
#61 0x00007f1d47e00c3e in g_main_context_dispatch (context=context@entry=0x7f1cd4000b60) at ../glib/gmain.c:3974
#62 0x00007f1d47e00ff0 in g_main_context_iterate (context=0x7f1cd4000b60, block=block@entry=1, dispatch=dispatch@entry=1, self=&lt;optimized out&gt;) at ../glib/gmain.c:4047
#63 0x00007f1d47e012e3 in g_main_loop_run (loop=0x7f1cd4001480) at ../glib/gmain.c:4241
#64 0x00007f1d4eb1a66a in WTF::RunLoop::run() () at ../../Source/WTF/wtf/glib/RunLoopGLib.cpp:96
#65 0x00007f1d5da05f17 in WebKit::&lt;lambda()&gt;::operator()(void) const (__closure=0x7f1cfc2872a8) at ../../Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp:49
#66 0x00007f1d5da0eaa8 in WTF::Detail::CallableWrapper&lt;WebKit::createRunLoop()::&lt;lambda()&gt;, void&gt;::call(void) (this=0x7f1cfc2872a0) at DerivedSources/ForwardingHeaders/wtf/Function.h:52
#67 0x00007f1d5ce82513 in WTF::Function&lt;void ()&gt;::operator()() const (this=0x7f1cdfffec30) at DerivedSources/ForwardingHeaders/wtf/Function.h:83
#68 0x00007f1d4ea98925 in WTF::Thread::entryPoint(WTF::Thread::NewThreadContext*) (newThreadContext=0x7f1cfc2862d0) at ../../Source/WTF/wtf/Threading.cpp:167
#69 0x00007f1d4eb21195 in WTF::wtfThreadEntryPoint(void*) (context=0x7f1cfc2862d0) at ../../Source/WTF/wtf/posix/ThreadingPOSIX.cpp:197
#70 0x00007f1d48e815e2 in start_thread (arg=&lt;optimized out&gt;) at pthread_create.c:479
#71 0x00007f1d46b0a473 in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:95</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1675171</commentid>
    <comment_count>1</comment_count>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2020-07-27 00:18:28 -0700</bug_when>
    <thetext>&gt; #7  0x00007f1d5e5dbc8d in WebCore::TextureMapperLayer::paintUsingOverlapRegions(WebCore::TextureMapperPaintOptions const&amp;) (this=0x7f1d04265100, options=...) at ../../Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:370

   368	    // Having both overlap and non-overlap regions carries some overhead. Avoid it if the overlap area
   369	    // is big anyway.
   370	    if (overlapRegion.bounds().size().area() &gt; nonOverlapRegion.bounds().size().area()) {
   371	        overlapRegion.unite(nonOverlapRegion);
   372	        nonOverlapRegion = Region();
   373	    }

This code was added by r149369 (Bug 115226).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1675495</commentid>
    <comment_count>2</comment_count>
      <attachid>405335</attachid>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2020-07-27 18:58:40 -0700</bug_when>
    <thetext>Created attachment 405335
WIP patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1675520</commentid>
    <comment_count>3</comment_count>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2020-07-27 23:41:19 -0700</bug_when>
    <thetext>TextureMapperLayer::computeOverlapRegions has the following code:

&gt;     boundingRect = m_layerTransforms.combined.mapRect(boundingRect);

This code calculates a tranformed bounding rect.
The original bounding rect was the the img size of thumbnail.
It was 187x132.
Then, it was transformed into 650749x156033.

Why does it apply 3d transform to calculate a overlap region?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1677391</commentid>
    <comment_count>4</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2020-08-03 13:33:31 -0700</bug_when>
    <thetext>&lt;rdar://problem/66489090&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1697168</commentid>
    <comment_count>5</comment_count>
      <attachid>411196</attachid>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2020-10-12 21:45:49 -0700</bug_when>
    <thetext>Created attachment 411196
test case</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1698303</commentid>
    <comment_count>6</comment_count>
      <attachid>411496</attachid>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2020-10-15 15:02:29 -0700</bug_when>
    <thetext>Created attachment 411496
WIP patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1698441</commentid>
    <comment_count>7</comment_count>
      <attachid>411525</attachid>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2020-10-15 19:52:55 -0700</bug_when>
    <thetext>Created attachment 411525
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1698484</commentid>
    <comment_count>8</comment_count>
      <attachid>411525</attachid>
    <who name="Carlos Garcia Campos">cgarcia</who>
    <bug_when>2020-10-16 00:41:51 -0700</bug_when>
    <thetext>Comment on attachment 411525
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=411525&amp;action=review

Jut a minor comment, I&apos;ll leave the actual review to Miguel

&gt; Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:326
&gt; +void TextureMapperLayer::computeOverlapRegions(Region&amp; overlapRegion, Region&amp; nonOverlapRegion, ResolveSelfOverlapMode mode, IntRect clipBounds)

const IntRect&amp; clipBounds? or even IntRect&amp;&amp; if clipbounds is not used by the caller after this.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1698847</commentid>
    <comment_count>9</comment_count>
      <attachid>411641</attachid>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2020-10-16 18:23:29 -0700</bug_when>
    <thetext>Created attachment 411641
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1698848</commentid>
    <comment_count>10</comment_count>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2020-10-16 18:30:34 -0700</bug_when>
    <thetext>Thank you for the review, KaL. Addressed the point.

This patch makes
compositing/clipping/border-radius-stacking-context-clip.html
pass unexpectedly.

This seems regression, not progression. I will check it.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1701773</commentid>
    <comment_count>11</comment_count>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2020-10-26 23:11:47 -0700</bug_when>
    <thetext>(In reply to Fujii Hironori from comment #10)
&gt; This patch makes
&gt; compositing/clipping/border-radius-stacking-context-clip.html
&gt; pass unexpectedly.
&gt; 
&gt; This seems regression, not progression. I will check it.

I&apos;m going to fix it in Bug 214868.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1702206</commentid>
    <comment_count>12</comment_count>
      <attachid>412499</attachid>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2020-10-27 19:36:46 -0700</bug_when>
    <thetext>Created attachment 412499
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1702207</commentid>
    <comment_count>13</comment_count>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2020-10-27 19:45:06 -0700</bug_when>
    <thetext>Oops. This patch make compositing/clipping/border-radius-stacking-context-clip.html fail again. I&apos;ll check it.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1703230</commentid>
    <comment_count>14</comment_count>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2020-10-30 15:15:33 -0700</bug_when>
    <thetext>(In reply to Fujii Hironori from comment #13)
&gt; Oops. This patch make
&gt; compositing/clipping/border-radius-stacking-context-clip.html fail again.
&gt; I&apos;ll check it.

r269204 fixed the issue.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1703233</commentid>
    <comment_count>15</comment_count>
      <attachid>412804</attachid>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2020-10-30 15:17:40 -0700</bug_when>
    <thetext>Created attachment 412804
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1703365</commentid>
    <comment_count>16</comment_count>
      <attachid>412853</attachid>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2020-10-31 13:14:14 -0700</bug_when>
    <thetext>Created attachment 412853
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1703366</commentid>
    <comment_count>17</comment_count>
      <attachid>412854</attachid>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2020-10-31 13:16:11 -0700</bug_when>
    <thetext>Created attachment 412854
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1703414</commentid>
    <comment_count>18</comment_count>
      <attachid>412867</attachid>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2020-11-01 12:30:19 -0800</bug_when>
    <thetext>Created attachment 412867
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1703897</commentid>
    <comment_count>19</comment_count>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2020-11-03 03:07:23 -0800</bug_when>
    <thetext>Review?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1704139</commentid>
    <comment_count>20</comment_count>
      <attachid>412867</attachid>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2020-11-03 12:33:02 -0800</bug_when>
    <thetext>Comment on attachment 412867
Patch

Clearing flags on attachment: 412867

Committed r269328: &lt;https://trac.webkit.org/changeset/269328&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1704140</commentid>
    <comment_count>21</comment_count>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2020-11-03 12:33:06 -0800</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>405335</attachid>
            <date>2020-07-27 18:58:40 -0700</date>
            <delta_ts>2020-10-15 15:02:29 -0700</delta_ts>
            <desc>WIP patch</desc>
            <filename>a.diff</filename>
            <type>text/plain</type>
            <size>840</size>
            <attacher name="Fujii Hironori">fujii</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0
dXJlTWFwcGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4
bWFwL1RleHR1cmVNYXBwZXJMYXllci5jcHAKaW5kZXggYWEyNTJhODA0MTcuLjg1ZTdiNGVlODg1
IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4
dHVyZU1hcHBlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj
cy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmNwcApAQCAtMzY3LDcgKzM2Nyw3IEBAIHZvaWQg
VGV4dHVyZU1hcHBlckxheWVyOjpwYWludFVzaW5nT3ZlcmxhcFJlZ2lvbnMoY29uc3QgVGV4dHVy
ZU1hcHBlclBhaW50T3B0aW9uCiAKICAgICAvLyBIYXZpbmcgYm90aCBvdmVybGFwIGFuZCBub24t
b3ZlcmxhcCByZWdpb25zIGNhcnJpZXMgc29tZSBvdmVyaGVhZC4gQXZvaWQgaXQgaWYgdGhlIG92
ZXJsYXAgYXJlYQogICAgIC8vIGlzIGJpZyBhbnl3YXkuCi0gICAgaWYgKG92ZXJsYXBSZWdpb24u
Ym91bmRzKCkuc2l6ZSgpLmFyZWEoKSA+IG5vbk92ZXJsYXBSZWdpb24uYm91bmRzKCkuc2l6ZSgp
LmFyZWEoKSkgeworICAgIGlmIChvdmVybGFwUmVnaW9uLmJvdW5kcygpLnNpemUoKS51bmNsYW1w
ZWRBcmVhKCkgPiBub25PdmVybGFwUmVnaW9uLmJvdW5kcygpLnNpemUoKS51bmNsYW1wZWRBcmVh
KCkpIHsKICAgICAgICAgb3ZlcmxhcFJlZ2lvbi51bml0ZShub25PdmVybGFwUmVnaW9uKTsKICAg
ICAgICAgbm9uT3ZlcmxhcFJlZ2lvbiA9IFJlZ2lvbigpOwogICAgIH0K
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="0"
              isprivate="0"
          >
            <attachid>411196</attachid>
            <date>2020-10-12 21:45:49 -0700</date>
            <delta_ts>2020-10-12 21:45:49 -0700</delta_ts>
            <desc>test case</desc>
            <filename>a.html</filename>
            <type>text/html</type>
            <size>376</size>
            <attacher name="Fujii Hironori">fujii</attacher>
            
              <data encoding="base64">PCFET0NUWVBFIGh0bWw+CjxodG1sPgogIDxoZWFkPgogICAgPHN0eWxlPgogICAgICAucGFyZW50
IHsKCSAgd2lkdGg6IDEwMDAwMHB4OwoJICBoZWlnaHQ6IDEwMDAwMHB4OwoJICB3aWxsLWNoYW5n
ZTogdHJhbnNmb3JtOwoJICBiYWNrZ3JvdW5kOiBncmVlbjsKCSAgb3BhY2l0eTogMC41OwogICAg
ICB9CiAgICAgIC5wYXJlbnQgZGl2IHsKCSAgd2lkdGg6IDEwMHB4OwoJICBoZWlnaHQ6IDEwMHB4
OwoJICB3aWxsLWNoYW5nZTogdHJhbnNmb3JtOwoJICBiYWNrZ3JvdW5kOiBibHVlOwogICAgICB9
CiAgICA8L3N0eWxlPgo8L2hlYWQ+Cjxib2R5PgogIDxkaXYgY2xhc3M9cGFyZW50PgogICAgPGRp
dj48L2Rpdj4KICA8L2Rpdj4KPC9ib2R5Pgo8L2h0bWw+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>411496</attachid>
            <date>2020-10-15 15:02:29 -0700</date>
            <delta_ts>2020-10-15 19:52:48 -0700</delta_ts>
            <desc>WIP patch</desc>
            <filename>a.diff</filename>
            <type>text/plain</type>
            <size>4812</size>
            <attacher name="Fujii Hironori">fujii</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0
dXJlTWFwcGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4
bWFwL1RleHR1cmVNYXBwZXJMYXllci5jcHAKaW5kZXggYTIzNmE2YTdhODQ5Li5lZTU1ZmIwZGU1
ZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9U
ZXh0dXJlTWFwcGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo
aWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIuY3BwCkBAIC0zMjMsNyArMzIzLDcgQEAgc3Rh
dGljIHZvaWQgcmVzb2x2ZU92ZXJsYXBzKFJlZ2lvbiYgbmV3UmVnaW9uLCBSZWdpb24mIG92ZXJs
YXBSZWdpb24sIFJlZ2lvbiYgbm8KICAgICBub25PdmVybGFwUmVnaW9uLnVuaXRlKG5ld1JlZ2lv
bik7CiB9CiAKLXZvaWQgVGV4dHVyZU1hcHBlckxheWVyOjpjb21wdXRlT3ZlcmxhcFJlZ2lvbnMo
UmVnaW9uJiBvdmVybGFwUmVnaW9uLCBSZWdpb24mIG5vbk92ZXJsYXBSZWdpb24sIFJlc29sdmVT
ZWxmT3ZlcmxhcE1vZGUgbW9kZSkKK3ZvaWQgVGV4dHVyZU1hcHBlckxheWVyOjpjb21wdXRlT3Zl
cmxhcFJlZ2lvbnMoUmVnaW9uJiBvdmVybGFwUmVnaW9uLCBSZWdpb24mIG5vbk92ZXJsYXBSZWdp
b24sIFJlc29sdmVTZWxmT3ZlcmxhcE1vZGUgbW9kZSwgSW50UmVjdCBjbGlwQm91bmRzKQogewog
ICAgIGlmICghbV9zdGF0ZS52aXNpYmxlIHx8ICFtX3N0YXRlLmNvbnRlbnRzVmlzaWJsZSkKICAg
ICAgICAgcmV0dXJuOwpAQCAtMzQ4LDIyICszNDgsMjMgQEAgdm9pZCBUZXh0dXJlTWFwcGVyTGF5
ZXI6OmNvbXB1dGVPdmVybGFwUmVnaW9ucyhSZWdpb24mIG92ZXJsYXBSZWdpb24sIFJlZ2lvbiYg
bm8KICAgICAgICAgYm91bmRpbmdSZWN0LnVuaXRlKHJlcGxpY2FNYXRyaXgubWFwUmVjdChib3Vu
ZGluZ1JlY3QpKTsKICAgICB9CiAKLSAgICBib3VuZGluZ1JlY3QgPSBtX2xheWVyVHJhbnNmb3Jt
cy5jb21iaW5lZC5tYXBSZWN0KGJvdW5kaW5nUmVjdCk7CisgICAgSW50UmVjdCB2aWV3cG9ydEJv
dW5kaW5nUmVjdCA9IGVuY2xvc2luZ0ludFJlY3QobV9sYXllclRyYW5zZm9ybXMuY29tYmluZWQu
bWFwUmVjdChib3VuZGluZ1JlY3QpKTsKKyAgICB2aWV3cG9ydEJvdW5kaW5nUmVjdC5pbnRlcnNl
Y3QoY2xpcEJvdW5kcyk7CiAKICAgICAvLyBDb3VudCBhbGwgbWFza3MgYW5kIGZpbHRlcnMgYXMg
b3ZlcmxhcCBsYXllcnMuCiAgICAgaWYgKGhhc0ZpbHRlcnMoKSB8fCBtX3N0YXRlLm1hc2tMYXll
ciB8fCAobV9zdGF0ZS5yZXBsaWNhTGF5ZXIgJiYgbV9zdGF0ZS5yZXBsaWNhTGF5ZXItPm1fc3Rh
dGUubWFza0xheWVyKSkgewotICAgICAgICBSZWdpb24gbmV3T3ZlcmxhcFJlZ2lvbihlbmNsb3Np
bmdJbnRSZWN0KGJvdW5kaW5nUmVjdCkpOworICAgICAgICBSZWdpb24gbmV3T3ZlcmxhcFJlZ2lv
bih2aWV3cG9ydEJvdW5kaW5nUmVjdCk7CiAgICAgICAgIG5vbk92ZXJsYXBSZWdpb24uc3VidHJh
Y3QobmV3T3ZlcmxhcFJlZ2lvbik7CiAgICAgICAgIG92ZXJsYXBSZWdpb24udW5pdGUobmV3T3Zl
cmxhcFJlZ2lvbik7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKICAgICBSZWdpb24gbmV3T3Zl
cmxhcFJlZ2lvbjsKLSAgICBSZWdpb24gbmV3Tm9uT3ZlcmxhcFJlZ2lvbihlbmNsb3NpbmdJbnRS
ZWN0KGJvdW5kaW5nUmVjdCkpOworICAgIFJlZ2lvbiBuZXdOb25PdmVybGFwUmVnaW9uKHZpZXdw
b3J0Qm91bmRpbmdSZWN0KTsKIAogICAgIGlmICghbV9zdGF0ZS5tYXNrc1RvQm91bmRzKSB7CiAg
ICAgICAgIGZvciAoYXV0byogY2hpbGQgOiBtX2NoaWxkcmVuKQotICAgICAgICAgICAgY2hpbGQt
PmNvbXB1dGVPdmVybGFwUmVnaW9ucyhuZXdPdmVybGFwUmVnaW9uLCBuZXdOb25PdmVybGFwUmVn
aW9uLCBSZXNvbHZlU2VsZk92ZXJsYXBJZk5lZWRlZCk7CisgICAgICAgICAgICBjaGlsZC0+Y29t
cHV0ZU92ZXJsYXBSZWdpb25zKG5ld092ZXJsYXBSZWdpb24sIG5ld05vbk92ZXJsYXBSZWdpb24s
IFJlc29sdmVTZWxmT3ZlcmxhcElmTmVlZGVkLCBjbGlwQm91bmRzKTsKICAgICB9CiAKICAgICBp
ZiAobV9zdGF0ZS5yZXBsaWNhTGF5ZXIpIHsKQEAgLTM4Myw5ICszODQsMTEgQEAgdm9pZCBUZXh0
dXJlTWFwcGVyTGF5ZXI6OmNvbXB1dGVPdmVybGFwUmVnaW9ucyhSZWdpb24mIG92ZXJsYXBSZWdp
b24sIFJlZ2lvbiYgbm8KIAogdm9pZCBUZXh0dXJlTWFwcGVyTGF5ZXI6OnBhaW50VXNpbmdPdmVy
bGFwUmVnaW9ucyhjb25zdCBUZXh0dXJlTWFwcGVyUGFpbnRPcHRpb25zJiBvcHRpb25zKQogewor
ICAgIEludFJlY3QgYWRqdXN0ZWRDbGlwQm91bmRzKG9wdGlvbnMudGV4dHVyZU1hcHBlci5jbGlw
Qm91bmRzKCkpOworICAgIGFkanVzdGVkQ2xpcEJvdW5kcy5tb3ZlKC1vcHRpb25zLm9mZnNldCk7
CiAgICAgUmVnaW9uIG92ZXJsYXBSZWdpb247CiAgICAgUmVnaW9uIG5vbk92ZXJsYXBSZWdpb247
Ci0gICAgY29tcHV0ZU92ZXJsYXBSZWdpb25zKG92ZXJsYXBSZWdpb24sIG5vbk92ZXJsYXBSZWdp
b24sIFJlc29sdmVTZWxmT3ZlcmxhcEFsd2F5cyk7CisgICAgY29tcHV0ZU92ZXJsYXBSZWdpb25z
KG92ZXJsYXBSZWdpb24sIG5vbk92ZXJsYXBSZWdpb24sIFJlc29sdmVTZWxmT3ZlcmxhcEFsd2F5
cywgYWRqdXN0ZWRDbGlwQm91bmRzKTsKICAgICBpZiAob3ZlcmxhcFJlZ2lvbi5pc0VtcHR5KCkp
IHsKICAgICAgICAgcGFpbnRTZWxmQW5kQ2hpbGRyZW5XaXRoUmVwbGljYShvcHRpb25zKTsKICAg
ICAgICAgcmV0dXJuOwpAQCAtNDAyLDkgKzQwNSw2IEBAIHZvaWQgVGV4dHVyZU1hcHBlckxheWVy
OjpwYWludFVzaW5nT3ZlcmxhcFJlZ2lvbnMoY29uc3QgVGV4dHVyZU1hcHBlclBhaW50T3B0aW9u
CiAgICAgYXV0byByZWN0cyA9IG5vbk92ZXJsYXBSZWdpb24ucmVjdHMoKTsKIAogICAgIGZvciAo
YXV0byYgcmVjdCA6IHJlY3RzKSB7Ci0gICAgICAgIGlmICghcmVjdC5pbnRlcnNlY3RzKG9wdGlv
bnMudGV4dHVyZU1hcHBlci5jbGlwQm91bmRzKCkpKQotICAgICAgICAgICAgY29udGludWU7Ci0K
ICAgICAgICAgb3B0aW9ucy50ZXh0dXJlTWFwcGVyLmJlZ2luQ2xpcChUcmFuc2Zvcm1hdGlvbk1h
dHJpeCgpLCByZWN0KTsKICAgICAgICAgcGFpbnRTZWxmQW5kQ2hpbGRyZW5XaXRoUmVwbGljYShv
cHRpb25zKTsKICAgICAgICAgb3B0aW9ucy50ZXh0dXJlTWFwcGVyLmVuZENsaXAoKTsKQEAgLTQx
OCwxNSArNDE4LDExIEBAIHZvaWQgVGV4dHVyZU1hcHBlckxheWVyOjpwYWludFVzaW5nT3Zlcmxh
cFJlZ2lvbnMoY29uc3QgVGV4dHVyZU1hcHBlclBhaW50T3B0aW9uCiAgICAgfQogCiAgICAgSW50
U2l6ZSBtYXhUZXh0dXJlU2l6ZSA9IG9wdGlvbnMudGV4dHVyZU1hcHBlci5tYXhUZXh0dXJlU2l6
ZSgpOwotICAgIEludFJlY3QgYWRqdXN0ZWRDbGlwQm91bmRzKG9wdGlvbnMudGV4dHVyZU1hcHBl
ci5jbGlwQm91bmRzKCkpOwotICAgIGFkanVzdGVkQ2xpcEJvdW5kcy5tb3ZlKC1vcHRpb25zLm9m
ZnNldCk7CiAgICAgZm9yIChhdXRvJiByZWN0IDogcmVjdHMpIHsKICAgICAgICAgZm9yIChpbnQg
eCA9IHJlY3QueCgpOyB4IDwgcmVjdC5tYXhYKCk7IHggKz0gbWF4VGV4dHVyZVNpemUud2lkdGgo
KSkgewogICAgICAgICAgICAgZm9yIChpbnQgeSA9IHJlY3QueSgpOyB5IDwgcmVjdC5tYXhZKCk7
IHkgKz0gbWF4VGV4dHVyZVNpemUuaGVpZ2h0KCkpIHsKICAgICAgICAgICAgICAgICBJbnRSZWN0
IHRpbGVSZWN0KEludFBvaW50KHgsIHkpLCBtYXhUZXh0dXJlU2l6ZSk7CiAgICAgICAgICAgICAg
ICAgdGlsZVJlY3QuaW50ZXJzZWN0KHJlY3QpOwotICAgICAgICAgICAgICAgIGlmICghdGlsZVJl
Y3QuaW50ZXJzZWN0cyhhZGp1c3RlZENsaXBCb3VuZHMpKQotICAgICAgICAgICAgICAgICAgICBj
b250aW51ZTsKIAogICAgICAgICAgICAgICAgIHBhaW50V2l0aEludGVybWVkaWF0ZVN1cmZhY2Uo
b3B0aW9ucywgdGlsZVJlY3QpOwogICAgICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJMYXllci5oIGIvU291
cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJMYXllci5o
CmluZGV4IDZkMjNlNDQ2NzliMS4uMGNlNjNiYzdlY2RjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmgKKysrIGIv
U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJMYXll
ci5oCkBAIC0xMjcsNyArMTI3LDcgQEAgcHJpdmF0ZToKICAgICAgICAgUmVzb2x2ZVNlbGZPdmVy
bGFwQWx3YXlzID0gMCwKICAgICAgICAgUmVzb2x2ZVNlbGZPdmVybGFwSWZOZWVkZWQKICAgICB9
OwotICAgIHZvaWQgY29tcHV0ZU92ZXJsYXBSZWdpb25zKFJlZ2lvbiYgb3ZlcmxhcFJlZ2lvbiwg
UmVnaW9uJiBub25PdmVybGFwUmVnaW9uLCBSZXNvbHZlU2VsZk92ZXJsYXBNb2RlKTsKKyAgICB2
b2lkIGNvbXB1dGVPdmVybGFwUmVnaW9ucyhSZWdpb24mIG92ZXJsYXBSZWdpb24sIFJlZ2lvbiYg
bm9uT3ZlcmxhcFJlZ2lvbiwgUmVzb2x2ZVNlbGZPdmVybGFwTW9kZSwgSW50UmVjdCBjbGlwQm91
bmRzKTsKIAogICAgIHZvaWQgcGFpbnRSZWN1cnNpdmUoY29uc3QgVGV4dHVyZU1hcHBlclBhaW50
T3B0aW9ucyYpOwogICAgIHZvaWQgcGFpbnRVc2luZ092ZXJsYXBSZWdpb25zKGNvbnN0IFRleHR1
cmVNYXBwZXJQYWludE9wdGlvbnMmKTsK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>411525</attachid>
            <date>2020-10-15 19:52:55 -0700</date>
            <delta_ts>2020-10-16 18:23:26 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-214817-20201016115253.patch</filename>
            <type>text/plain</type>
            <size>9039</size>
            <attacher name="Fujii Hironori">fujii</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4NTYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGIwZGJhY2I1NTcyMjIz
OTE4NzU4NzUyYzFkYjU2NWZlMGEyZGY4NS4uNDk2ZGUxMmNmNWE3OTQ0NzMzYWFkNDYwZWRiODAz
MjQzMjlkNjA0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIwLTEwLTE1ICBGdWpp
aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFtUZXh0dXJl
TWFwcGVyXSBDcmFzaGVkIGluIFRleHR1cmVNYXBwZXJMYXllcjo6cGFpbnRVc2luZ092ZXJsYXBS
ZWdpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y
MTQ4MTcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY2NDg5MDkwPgorCisgICAgICAgIFJldmll
d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRleHR1cmVNYXBwZXJMYXllcjo6cGFp
bnRVc2luZ092ZXJsYXBSZWdpb25zIGhhcyB0aGUgZXhwcmVzc2lvbgorICAgICAgICBgb3Zlcmxh
cFJlZ2lvbi5ib3VuZHMoKS5zaXplKCkuYXJlYSgpYCB3aGljaCBjcmFzaGVzIGZvciBhIHZlcnkK
KyAgICAgICAgbGFyZ2UgbGF5ZXJzLgorCisgICAgICAgIGNvbXB1dGVPdmVybGFwUmVnaW9ucyBy
ZXR1cm5lZCB2ZXJ5IGxhcmdlIG92ZXJsYXAgYW5kIG5vbi1vdmVybGFwCisgICAgICAgIHJlZ2lv
bnMgd2l0aG91dCB0YWtpbmcgdGhlIGNsaXAgYm91bmRzIGludG8gYWNjb3VudC4KKworICAgICAg
ICBDaGFuZ2UgY29tcHV0ZU92ZXJsYXBSZWdpb25zIHRvIHRha2UgY2xpcCBib3VuZHMgYXMgYSBh
cmd1bWVudCBhbmQKKyAgICAgICAgcmV0dXJuIGNsaXBwZWQgcmVnaW9ucy4KKworICAgICAgICBU
ZXN0OiBjb21wb3NpdGluZy90aWxpbmcvaHVnZS1sYXllci13aXRoLW9wYWNpdHkuaHRtbAorCisg
ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJMYXllci5jcHA6
CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyTGF5ZXI6OmNvbXB1dGVPdmVybGFwUmVn
aW9ucyk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyTGF5ZXI6OnBhaW50VXNpbmdP
dmVybGFwUmVnaW9ucyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1
cmVNYXBwZXJMYXllci5oOgorCiAyMDIwLTEwLTE1ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhm
aWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgW0NvY29hXSBEb24ndCBjaGFuZ2UgdGhlIHRleHQg
bWF0cml4IG11bHRpcGxlIHRpbWVzIGluc2lkZSBGb250Q2FzY2FkZTo6ZHJhd0dseXBocygpCmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVy
ZU1hcHBlckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1h
cC9UZXh0dXJlTWFwcGVyTGF5ZXIuY3BwCmluZGV4IGEyMzZhNmE3YTg0OWUyMDBjNzM5MTBlYzY1
ODMzOThlZjc4MWYzMTIuLjM1NmQyYWYwOWIyMTI4MzU1MWZhMmUzZmFjYjJhZjQ0Nzc1MTFiZWQg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0
dXJlTWFwcGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz
L3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIuY3BwCkBAIC0zMjMsNyArMzIzLDcgQEAgc3RhdGlj
IHZvaWQgcmVzb2x2ZU92ZXJsYXBzKFJlZ2lvbiYgbmV3UmVnaW9uLCBSZWdpb24mIG92ZXJsYXBS
ZWdpb24sIFJlZ2lvbiYgbm8KICAgICBub25PdmVybGFwUmVnaW9uLnVuaXRlKG5ld1JlZ2lvbik7
CiB9CiAKLXZvaWQgVGV4dHVyZU1hcHBlckxheWVyOjpjb21wdXRlT3ZlcmxhcFJlZ2lvbnMoUmVn
aW9uJiBvdmVybGFwUmVnaW9uLCBSZWdpb24mIG5vbk92ZXJsYXBSZWdpb24sIFJlc29sdmVTZWxm
T3ZlcmxhcE1vZGUgbW9kZSkKK3ZvaWQgVGV4dHVyZU1hcHBlckxheWVyOjpjb21wdXRlT3Zlcmxh
cFJlZ2lvbnMoUmVnaW9uJiBvdmVybGFwUmVnaW9uLCBSZWdpb24mIG5vbk92ZXJsYXBSZWdpb24s
IFJlc29sdmVTZWxmT3ZlcmxhcE1vZGUgbW9kZSwgSW50UmVjdCBjbGlwQm91bmRzKQogewogICAg
IGlmICghbV9zdGF0ZS52aXNpYmxlIHx8ICFtX3N0YXRlLmNvbnRlbnRzVmlzaWJsZSkKICAgICAg
ICAgcmV0dXJuOwpAQCAtMzQ4LDIyICszNDgsMjMgQEAgdm9pZCBUZXh0dXJlTWFwcGVyTGF5ZXI6
OmNvbXB1dGVPdmVybGFwUmVnaW9ucyhSZWdpb24mIG92ZXJsYXBSZWdpb24sIFJlZ2lvbiYgbm8K
ICAgICAgICAgYm91bmRpbmdSZWN0LnVuaXRlKHJlcGxpY2FNYXRyaXgubWFwUmVjdChib3VuZGlu
Z1JlY3QpKTsKICAgICB9CiAKLSAgICBib3VuZGluZ1JlY3QgPSBtX2xheWVyVHJhbnNmb3Jtcy5j
b21iaW5lZC5tYXBSZWN0KGJvdW5kaW5nUmVjdCk7CisgICAgSW50UmVjdCB2aWV3cG9ydEJvdW5k
aW5nUmVjdCA9IGVuY2xvc2luZ0ludFJlY3QobV9sYXllclRyYW5zZm9ybXMuY29tYmluZWQubWFw
UmVjdChib3VuZGluZ1JlY3QpKTsKKyAgICB2aWV3cG9ydEJvdW5kaW5nUmVjdC5pbnRlcnNlY3Qo
Y2xpcEJvdW5kcyk7CiAKICAgICAvLyBDb3VudCBhbGwgbWFza3MgYW5kIGZpbHRlcnMgYXMgb3Zl
cmxhcCBsYXllcnMuCiAgICAgaWYgKGhhc0ZpbHRlcnMoKSB8fCBtX3N0YXRlLm1hc2tMYXllciB8
fCAobV9zdGF0ZS5yZXBsaWNhTGF5ZXIgJiYgbV9zdGF0ZS5yZXBsaWNhTGF5ZXItPm1fc3RhdGUu
bWFza0xheWVyKSkgewotICAgICAgICBSZWdpb24gbmV3T3ZlcmxhcFJlZ2lvbihlbmNsb3NpbmdJ
bnRSZWN0KGJvdW5kaW5nUmVjdCkpOworICAgICAgICBSZWdpb24gbmV3T3ZlcmxhcFJlZ2lvbih2
aWV3cG9ydEJvdW5kaW5nUmVjdCk7CiAgICAgICAgIG5vbk92ZXJsYXBSZWdpb24uc3VidHJhY3Qo
bmV3T3ZlcmxhcFJlZ2lvbik7CiAgICAgICAgIG92ZXJsYXBSZWdpb24udW5pdGUobmV3T3Zlcmxh
cFJlZ2lvbik7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKICAgICBSZWdpb24gbmV3T3Zlcmxh
cFJlZ2lvbjsKLSAgICBSZWdpb24gbmV3Tm9uT3ZlcmxhcFJlZ2lvbihlbmNsb3NpbmdJbnRSZWN0
KGJvdW5kaW5nUmVjdCkpOworICAgIFJlZ2lvbiBuZXdOb25PdmVybGFwUmVnaW9uKHZpZXdwb3J0
Qm91bmRpbmdSZWN0KTsKIAogICAgIGlmICghbV9zdGF0ZS5tYXNrc1RvQm91bmRzKSB7CiAgICAg
ICAgIGZvciAoYXV0byogY2hpbGQgOiBtX2NoaWxkcmVuKQotICAgICAgICAgICAgY2hpbGQtPmNv
bXB1dGVPdmVybGFwUmVnaW9ucyhuZXdPdmVybGFwUmVnaW9uLCBuZXdOb25PdmVybGFwUmVnaW9u
LCBSZXNvbHZlU2VsZk92ZXJsYXBJZk5lZWRlZCk7CisgICAgICAgICAgICBjaGlsZC0+Y29tcHV0
ZU92ZXJsYXBSZWdpb25zKG5ld092ZXJsYXBSZWdpb24sIG5ld05vbk92ZXJsYXBSZWdpb24sIFJl
c29sdmVTZWxmT3ZlcmxhcElmTmVlZGVkLCBjbGlwQm91bmRzKTsKICAgICB9CiAKICAgICBpZiAo
bV9zdGF0ZS5yZXBsaWNhTGF5ZXIpIHsKQEAgLTM4Myw5ICszODQsMTIgQEAgdm9pZCBUZXh0dXJl
TWFwcGVyTGF5ZXI6OmNvbXB1dGVPdmVybGFwUmVnaW9ucyhSZWdpb24mIG92ZXJsYXBSZWdpb24s
IFJlZ2lvbiYgbm8KIAogdm9pZCBUZXh0dXJlTWFwcGVyTGF5ZXI6OnBhaW50VXNpbmdPdmVybGFw
UmVnaW9ucyhjb25zdCBUZXh0dXJlTWFwcGVyUGFpbnRPcHRpb25zJiBvcHRpb25zKQogeworICAg
IC8vIGNsaXBCb3VuZHMgY2FuIGJlIGluIHRoZSB0YXJnZXQgdGV4dHVyZSBsb2NhbCBjb29yZGlu
YXRlIHN5c3RlbS4gQ29udmVydCBpdCB0byB0aGUgdmlld3BvcnQgY29vcmRpbmF0ZSBzeXN0ZW0u
CisgICAgSW50UmVjdCBjbGlwQm91bmRzKG9wdGlvbnMudGV4dHVyZU1hcHBlci5jbGlwQm91bmRz
KCkpOworICAgIGNsaXBCb3VuZHMubW92ZSgtb3B0aW9ucy5vZmZzZXQpOwogICAgIFJlZ2lvbiBv
dmVybGFwUmVnaW9uOwogICAgIFJlZ2lvbiBub25PdmVybGFwUmVnaW9uOwotICAgIGNvbXB1dGVP
dmVybGFwUmVnaW9ucyhvdmVybGFwUmVnaW9uLCBub25PdmVybGFwUmVnaW9uLCBSZXNvbHZlU2Vs
Zk92ZXJsYXBBbHdheXMpOworICAgIGNvbXB1dGVPdmVybGFwUmVnaW9ucyhvdmVybGFwUmVnaW9u
LCBub25PdmVybGFwUmVnaW9uLCBSZXNvbHZlU2VsZk92ZXJsYXBBbHdheXMsIGNsaXBCb3VuZHMp
OwogICAgIGlmIChvdmVybGFwUmVnaW9uLmlzRW1wdHkoKSkgewogICAgICAgICBwYWludFNlbGZB
bmRDaGlsZHJlbldpdGhSZXBsaWNhKG9wdGlvbnMpOwogICAgICAgICByZXR1cm47CkBAIC00MDIs
OSArNDA2LDYgQEAgdm9pZCBUZXh0dXJlTWFwcGVyTGF5ZXI6OnBhaW50VXNpbmdPdmVybGFwUmVn
aW9ucyhjb25zdCBUZXh0dXJlTWFwcGVyUGFpbnRPcHRpb24KICAgICBhdXRvIHJlY3RzID0gbm9u
T3ZlcmxhcFJlZ2lvbi5yZWN0cygpOwogCiAgICAgZm9yIChhdXRvJiByZWN0IDogcmVjdHMpIHsK
LSAgICAgICAgaWYgKCFyZWN0LmludGVyc2VjdHMob3B0aW9ucy50ZXh0dXJlTWFwcGVyLmNsaXBC
b3VuZHMoKSkpCi0gICAgICAgICAgICBjb250aW51ZTsKLQogICAgICAgICBvcHRpb25zLnRleHR1
cmVNYXBwZXIuYmVnaW5DbGlwKFRyYW5zZm9ybWF0aW9uTWF0cml4KCksIHJlY3QpOwogICAgICAg
ICBwYWludFNlbGZBbmRDaGlsZHJlbldpdGhSZXBsaWNhKG9wdGlvbnMpOwogICAgICAgICBvcHRp
b25zLnRleHR1cmVNYXBwZXIuZW5kQ2xpcCgpOwpAQCAtNDE4LDE1ICs0MTksMTEgQEAgdm9pZCBU
ZXh0dXJlTWFwcGVyTGF5ZXI6OnBhaW50VXNpbmdPdmVybGFwUmVnaW9ucyhjb25zdCBUZXh0dXJl
TWFwcGVyUGFpbnRPcHRpb24KICAgICB9CiAKICAgICBJbnRTaXplIG1heFRleHR1cmVTaXplID0g
b3B0aW9ucy50ZXh0dXJlTWFwcGVyLm1heFRleHR1cmVTaXplKCk7Ci0gICAgSW50UmVjdCBhZGp1
c3RlZENsaXBCb3VuZHMob3B0aW9ucy50ZXh0dXJlTWFwcGVyLmNsaXBCb3VuZHMoKSk7Ci0gICAg
YWRqdXN0ZWRDbGlwQm91bmRzLm1vdmUoLW9wdGlvbnMub2Zmc2V0KTsKICAgICBmb3IgKGF1dG8m
IHJlY3QgOiByZWN0cykgewogICAgICAgICBmb3IgKGludCB4ID0gcmVjdC54KCk7IHggPCByZWN0
Lm1heFgoKTsgeCArPSBtYXhUZXh0dXJlU2l6ZS53aWR0aCgpKSB7CiAgICAgICAgICAgICBmb3Ig
KGludCB5ID0gcmVjdC55KCk7IHkgPCByZWN0Lm1heFkoKTsgeSArPSBtYXhUZXh0dXJlU2l6ZS5o
ZWlnaHQoKSkgewogICAgICAgICAgICAgICAgIEludFJlY3QgdGlsZVJlY3QoSW50UG9pbnQoeCwg
eSksIG1heFRleHR1cmVTaXplKTsKICAgICAgICAgICAgICAgICB0aWxlUmVjdC5pbnRlcnNlY3Qo
cmVjdCk7Ci0gICAgICAgICAgICAgICAgaWYgKCF0aWxlUmVjdC5pbnRlcnNlY3RzKGFkanVzdGVk
Q2xpcEJvdW5kcykpCi0gICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogCiAgICAgICAgICAg
ICAgICAgcGFpbnRXaXRoSW50ZXJtZWRpYXRlU3VyZmFjZShvcHRpb25zLCB0aWxlUmVjdCk7CiAg
ICAgICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj
cy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n
cmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmgKaW5kZXggNmQyM2U0NDY3OWIxNzlj
MjhhYWY5ZDdkNWExYmNhYTZlZDg2ODE0Yi4uMGNlNjNiYzdlY2RjNTY5MzM2OTgyNTk3YWQzZTBh
OWI4OGYxNWViMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv
dGV4bWFwL1RleHR1cmVNYXBwZXJMYXllci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt
L2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIuaApAQCAtMTI3LDcgKzEyNyw3IEBA
IHByaXZhdGU6CiAgICAgICAgIFJlc29sdmVTZWxmT3ZlcmxhcEFsd2F5cyA9IDAsCiAgICAgICAg
IFJlc29sdmVTZWxmT3ZlcmxhcElmTmVlZGVkCiAgICAgfTsKLSAgICB2b2lkIGNvbXB1dGVPdmVy
bGFwUmVnaW9ucyhSZWdpb24mIG92ZXJsYXBSZWdpb24sIFJlZ2lvbiYgbm9uT3ZlcmxhcFJlZ2lv
biwgUmVzb2x2ZVNlbGZPdmVybGFwTW9kZSk7CisgICAgdm9pZCBjb21wdXRlT3ZlcmxhcFJlZ2lv
bnMoUmVnaW9uJiBvdmVybGFwUmVnaW9uLCBSZWdpb24mIG5vbk92ZXJsYXBSZWdpb24sIFJlc29s
dmVTZWxmT3ZlcmxhcE1vZGUsIEludFJlY3QgY2xpcEJvdW5kcyk7CiAKICAgICB2b2lkIHBhaW50
UmVjdXJzaXZlKGNvbnN0IFRleHR1cmVNYXBwZXJQYWludE9wdGlvbnMmKTsKICAgICB2b2lkIHBh
aW50VXNpbmdPdmVybGFwUmVnaW9ucyhjb25zdCBUZXh0dXJlTWFwcGVyUGFpbnRPcHRpb25zJik7
CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM
b2cKaW5kZXggZGVkN2YyNmE2NmEyMDdmOTFmOGY2NDdiMGU5ZDM1Yzg4ZjhhNmJkYy4uNjNjOTE0
ODBjZDdhMDcwYTYyZmZlNzJmNDk3NGQ0ZjhkMjkzMDRlNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz
dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBA
CisyMDIwLTEwLTE1ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgor
CisgICAgICAgIFtUZXh0dXJlTWFwcGVyXSBDcmFzaGVkIGluIFRleHR1cmVNYXBwZXJMYXllcjo6
cGFpbnRVc2luZ092ZXJsYXBSZWdpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn
L3Nob3dfYnVnLmNnaT9pZD0yMTQ4MTcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY2NDg5MDkw
PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogY29t
cG9zaXRpbmcvdGlsaW5nL2h1Z2UtbGF5ZXItd2l0aC1vcGFjaXR5LWV4cGVjdGVkLmh0bWw6IEFk
ZGVkLgorICAgICAgICAqIGNvbXBvc2l0aW5nL3RpbGluZy9odWdlLWxheWVyLXdpdGgtb3BhY2l0
eS5odG1sOiBBZGRlZC4KKwogMjAyMC0xMC0xNSAgVHJ1aXR0IFNhdmVsbCAgPHRzYXZlbGxAYXBw
bGUuY29tPgogCiAgICAgICAgIFJlYmFzZWxpbmUgdGVzdHMgZm9yIENhdGFsaW5hIGFuZCBpT1Mg
YWZ0ZXIgdGhlIGNoYW5nZXMgaW4gcjI2ODUyMApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY29t
cG9zaXRpbmcvdGlsaW5nL2h1Z2UtbGF5ZXItd2l0aC1vcGFjaXR5LWV4cGVjdGVkLmh0bWwgYi9M
YXlvdXRUZXN0cy9jb21wb3NpdGluZy90aWxpbmcvaHVnZS1sYXllci13aXRoLW9wYWNpdHktZXhw
ZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5mOGNkZDYyMzY2ODlhYjU5Zjg0ZDM5MGFiMzY5ZWM3NDA3
OTZkMzAyCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvdGlsaW5n
L2h1Z2UtbGF5ZXItd2l0aC1vcGFjaXR5LWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwyMiBAQAor
PCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKyAgICA8aGVhZD4KKyAgICAgICAgPG1ldGEgY2hhcnNl
dD0idXRmLTgiPgorICAgICAgICA8c3R5bGU+CisgICAgICAgICAgICBkaXYgeworICAgICAgICAg
ICAgICAgIHdpZHRoOiAxMDAwMDBweDsKKyAgICAgICAgICAgICAgICBoZWlnaHQ6IDEwMDAwMHB4
OworICAgICAgICAgICAgICAgIGJhY2tncm91bmQ6IGdyZWVuOworICAgICAgICAgICAgfQorICAg
ICAgICAgICAgLnBhcmVudCB7CisgICAgICAgICAgICAgICAgb3BhY2l0eTogMC41OworICAgICAg
ICAgICAgfQorICAgICAgICA8L3N0eWxlPgorICAgIDwvaGVhZD4KKyAgICA8Ym9keT4KKyAgICAg
ICAgUmVuZGVyaW5nIGEgaHVnZSBvcGFjaXR5IGxheWVyIHNob3VsZG4ndCBjcmFzaCA8YSBocmVm
PSJodHRwczovL3dlYmtpdC5vcmcvYi8yMTQ4MTciPkJ1ZyAyMTQ4MTc8L2E+LgorICAgICAgICA8
ZGl2IGNsYXNzPXBhcmVudD4KKyAgICAgICAgICAgIDxkaXY+PC9kaXY+CisgICAgICAgIDwvZGl2
PgorICAgIDwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NvbXBvc2l0
aW5nL3RpbGluZy9odWdlLWxheWVyLXdpdGgtb3BhY2l0eS5odG1sIGIvTGF5b3V0VGVzdHMvY29t
cG9zaXRpbmcvdGlsaW5nL2h1Z2UtbGF5ZXItd2l0aC1vcGFjaXR5Lmh0bWwKbmV3IGZpbGUgbW9k
ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4u
Mzg2YmUxZjgxN2JiMTE4ODdiN2UwYzZmMzgwM2QyZGM0ZDIyM2E3OAotLS0gL2Rldi9udWxsCisr
KyBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL3RpbGluZy9odWdlLWxheWVyLXdpdGgtb3BhY2l0
eS5odG1sCkBAIC0wLDAgKzEsMjMgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+CisgICAgPGhl
YWQ+CisgICAgICAgIDxtZXRhIGNoYXJzZXQ9InV0Zi04Ij4KKyAgICAgICAgPHN0eWxlPgorICAg
ICAgICAgICAgZGl2IHsKKyAgICAgICAgICAgICAgICB3aWR0aDogMTAwMDAwcHg7CisgICAgICAg
ICAgICAgICAgaGVpZ2h0OiAxMDAwMDBweDsKKyAgICAgICAgICAgICAgICBiYWNrZ3JvdW5kOiBn
cmVlbjsKKyAgICAgICAgICAgICAgICB3aWxsLWNoYW5nZTogdHJhbnNmb3JtOworICAgICAgICAg
ICAgfQorICAgICAgICAgICAgLnBhcmVudCB7CisgICAgICAgICAgICAgICAgb3BhY2l0eTogMC41
OworICAgICAgICAgICAgfQorICAgICAgICA8L3N0eWxlPgorICAgIDwvaGVhZD4KKyAgICA8Ym9k
eT4KKyAgICAgICAgUmVuZGVyaW5nIGEgaHVnZSBvcGFjaXR5IGxheWVyIHNob3VsZG4ndCBjcmFz
aCA8YSBocmVmPSJodHRwczovL3dlYmtpdC5vcmcvYi8yMTQ4MTciPkJ1ZyAyMTQ4MTc8L2E+Lgor
ICAgICAgICA8ZGl2IGNsYXNzPXBhcmVudD4KKyAgICAgICAgICAgIDxkaXY+PC9kaXY+CisgICAg
ICAgIDwvZGl2PgorICAgIDwvYm9keT4KKzwvaHRtbD4K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>411641</attachid>
            <date>2020-10-16 18:23:29 -0700</date>
            <delta_ts>2020-10-27 19:36:43 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-214817-20201017102327.patch</filename>
            <type>text/plain</type>
            <size>9166</size>
            <attacher name="Fujii Hironori">fujii</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4NTYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGIwZGJhY2I1NTcyMjIz
OTE4NzU4NzUyYzFkYjU2NWZlMGEyZGY4NS4uYzk5NGNkNWNiMjMzOWFjMDI5YmIxNjJkZWUwMzg4
YTg0MDc2OTM3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIwLTEwLTE1ICBGdWpp
aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFtUZXh0dXJl
TWFwcGVyXSBDcmFzaGVkIGluIFRleHR1cmVNYXBwZXJMYXllcjo6cGFpbnRVc2luZ092ZXJsYXBS
ZWdpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y
MTQ4MTcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY2NDg5MDkwPgorCisgICAgICAgIFJldmll
d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRleHR1cmVNYXBwZXJMYXllcjo6cGFp
bnRVc2luZ092ZXJsYXBSZWdpb25zIGhhcyB0aGUgZXhwcmVzc2lvbgorICAgICAgICBgb3Zlcmxh
cFJlZ2lvbi5ib3VuZHMoKS5zaXplKCkuYXJlYSgpYCB3aGljaCBjcmFzaGVzIGZvciBhIHZlcnkK
KyAgICAgICAgbGFyZ2UgbGF5ZXJzLgorCisgICAgICAgIGNvbXB1dGVPdmVybGFwUmVnaW9ucyBy
ZXR1cm5lZCB2ZXJ5IGxhcmdlIG92ZXJsYXAgYW5kIG5vbi1vdmVybGFwCisgICAgICAgIHJlZ2lv
bnMgd2l0aG91dCB0YWtpbmcgdGhlIGNsaXAgYm91bmRzIGludG8gYWNjb3VudC4KKworICAgICAg
ICBDaGFuZ2UgY29tcHV0ZU92ZXJsYXBSZWdpb25zIHRvIHRha2UgdGhlIGNsaXAgYm91bmRzIGFz
IGEgYXJndW1lbnQKKyAgICAgICAgYW5kIHJldHVybiBjbGlwcGVkIHJlZ2lvbnMuCisKKyAgICAg
ICAgVGVzdDogY29tcG9zaXRpbmcvdGlsaW5nL2h1Z2UtbGF5ZXItd2l0aC1vcGFjaXR5Lmh0bWwK
KworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIu
Y3BwOgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlckxheWVyOjpjb21wdXRlT3Zlcmxh
cFJlZ2lvbnMpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlckxheWVyOjpwYWludFVz
aW5nT3ZlcmxhcFJlZ2lvbnMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9U
ZXh0dXJlTWFwcGVyTGF5ZXIuaDoKKwogMjAyMC0xMC0xNSAgTXlsZXMgQy4gTWF4ZmllbGQgIDxt
bWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFtDb2NvYV0gRG9uJ3QgY2hhbmdlIHRoZSB0
ZXh0IG1hdHJpeCBtdWx0aXBsZSB0aW1lcyBpbnNpZGUgRm9udENhc2NhZGU6OmRyYXdHbHlwaHMo
KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1Rl
eHR1cmVNYXBwZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90
ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmNwcAppbmRleCBhMjM2YTZhN2E4NDllMjAwYzczOTEw
ZWM2NTgzMzk4ZWY3ODFmMzEyLi43YWM0MjlmYTI5MmUxZDdhMzM1YTMzOWQzZGI3NmJhY2JkM2Nm
NWM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAv
VGV4dHVyZU1hcHBlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw
aGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmNwcApAQCAtMzIzLDcgKzMyMyw3IEBAIHN0
YXRpYyB2b2lkIHJlc29sdmVPdmVybGFwcyhSZWdpb24mIG5ld1JlZ2lvbiwgUmVnaW9uJiBvdmVy
bGFwUmVnaW9uLCBSZWdpb24mIG5vCiAgICAgbm9uT3ZlcmxhcFJlZ2lvbi51bml0ZShuZXdSZWdp
b24pOwogfQogCi12b2lkIFRleHR1cmVNYXBwZXJMYXllcjo6Y29tcHV0ZU92ZXJsYXBSZWdpb25z
KFJlZ2lvbiYgb3ZlcmxhcFJlZ2lvbiwgUmVnaW9uJiBub25PdmVybGFwUmVnaW9uLCBSZXNvbHZl
U2VsZk92ZXJsYXBNb2RlIG1vZGUpCit2b2lkIFRleHR1cmVNYXBwZXJMYXllcjo6Y29tcHV0ZU92
ZXJsYXBSZWdpb25zKFJlZ2lvbiYgb3ZlcmxhcFJlZ2lvbiwgUmVnaW9uJiBub25PdmVybGFwUmVn
aW9uLCBSZXNvbHZlU2VsZk92ZXJsYXBNb2RlIG1vZGUsIGNvbnN0IEludFJlY3QmIGNsaXBCb3Vu
ZHMpCiB7CiAgICAgaWYgKCFtX3N0YXRlLnZpc2libGUgfHwgIW1fc3RhdGUuY29udGVudHNWaXNp
YmxlKQogICAgICAgICByZXR1cm47CkBAIC0zNDgsMjIgKzM0OCwyMyBAQCB2b2lkIFRleHR1cmVN
YXBwZXJMYXllcjo6Y29tcHV0ZU92ZXJsYXBSZWdpb25zKFJlZ2lvbiYgb3ZlcmxhcFJlZ2lvbiwg
UmVnaW9uJiBubwogICAgICAgICBib3VuZGluZ1JlY3QudW5pdGUocmVwbGljYU1hdHJpeC5tYXBS
ZWN0KGJvdW5kaW5nUmVjdCkpOwogICAgIH0KIAotICAgIGJvdW5kaW5nUmVjdCA9IG1fbGF5ZXJU
cmFuc2Zvcm1zLmNvbWJpbmVkLm1hcFJlY3QoYm91bmRpbmdSZWN0KTsKKyAgICBJbnRSZWN0IHZp
ZXdwb3J0Qm91bmRpbmdSZWN0ID0gZW5jbG9zaW5nSW50UmVjdChtX2xheWVyVHJhbnNmb3Jtcy5j
b21iaW5lZC5tYXBSZWN0KGJvdW5kaW5nUmVjdCkpOworICAgIHZpZXdwb3J0Qm91bmRpbmdSZWN0
LmludGVyc2VjdChjbGlwQm91bmRzKTsKIAogICAgIC8vIENvdW50IGFsbCBtYXNrcyBhbmQgZmls
dGVycyBhcyBvdmVybGFwIGxheWVycy4KICAgICBpZiAoaGFzRmlsdGVycygpIHx8IG1fc3RhdGUu
bWFza0xheWVyIHx8IChtX3N0YXRlLnJlcGxpY2FMYXllciAmJiBtX3N0YXRlLnJlcGxpY2FMYXll
ci0+bV9zdGF0ZS5tYXNrTGF5ZXIpKSB7Ci0gICAgICAgIFJlZ2lvbiBuZXdPdmVybGFwUmVnaW9u
KGVuY2xvc2luZ0ludFJlY3QoYm91bmRpbmdSZWN0KSk7CisgICAgICAgIFJlZ2lvbiBuZXdPdmVy
bGFwUmVnaW9uKHZpZXdwb3J0Qm91bmRpbmdSZWN0KTsKICAgICAgICAgbm9uT3ZlcmxhcFJlZ2lv
bi5zdWJ0cmFjdChuZXdPdmVybGFwUmVnaW9uKTsKICAgICAgICAgb3ZlcmxhcFJlZ2lvbi51bml0
ZShuZXdPdmVybGFwUmVnaW9uKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIFJlZ2lv
biBuZXdPdmVybGFwUmVnaW9uOwotICAgIFJlZ2lvbiBuZXdOb25PdmVybGFwUmVnaW9uKGVuY2xv
c2luZ0ludFJlY3QoYm91bmRpbmdSZWN0KSk7CisgICAgUmVnaW9uIG5ld05vbk92ZXJsYXBSZWdp
b24odmlld3BvcnRCb3VuZGluZ1JlY3QpOwogCiAgICAgaWYgKCFtX3N0YXRlLm1hc2tzVG9Cb3Vu
ZHMpIHsKICAgICAgICAgZm9yIChhdXRvKiBjaGlsZCA6IG1fY2hpbGRyZW4pCi0gICAgICAgICAg
ICBjaGlsZC0+Y29tcHV0ZU92ZXJsYXBSZWdpb25zKG5ld092ZXJsYXBSZWdpb24sIG5ld05vbk92
ZXJsYXBSZWdpb24sIFJlc29sdmVTZWxmT3ZlcmxhcElmTmVlZGVkKTsKKyAgICAgICAgICAgIGNo
aWxkLT5jb21wdXRlT3ZlcmxhcFJlZ2lvbnMobmV3T3ZlcmxhcFJlZ2lvbiwgbmV3Tm9uT3Zlcmxh
cFJlZ2lvbiwgUmVzb2x2ZVNlbGZPdmVybGFwSWZOZWVkZWQsIGNsaXBCb3VuZHMpOwogICAgIH0K
IAogICAgIGlmIChtX3N0YXRlLnJlcGxpY2FMYXllcikgewpAQCAtMzgzLDkgKzM4NCwxMiBAQCB2
b2lkIFRleHR1cmVNYXBwZXJMYXllcjo6Y29tcHV0ZU92ZXJsYXBSZWdpb25zKFJlZ2lvbiYgb3Zl
cmxhcFJlZ2lvbiwgUmVnaW9uJiBubwogCiB2b2lkIFRleHR1cmVNYXBwZXJMYXllcjo6cGFpbnRV
c2luZ092ZXJsYXBSZWdpb25zKGNvbnN0IFRleHR1cmVNYXBwZXJQYWludE9wdGlvbnMmIG9wdGlv
bnMpCiB7CisgICAgLy8gY2xpcEJvdW5kcyBjYW4gYmUgaW4gdGhlIHRhcmdldCB0ZXh0dXJlIGxv
Y2FsIGNvb3JkaW5hdGUgc3lzdGVtLiBDb252ZXJ0IGl0IHRvIHRoZSB2aWV3cG9ydCBjb29yZGlu
YXRlIHN5c3RlbS4KKyAgICBJbnRSZWN0IGNsaXBCb3VuZHMob3B0aW9ucy50ZXh0dXJlTWFwcGVy
LmNsaXBCb3VuZHMoKSk7CisgICAgY2xpcEJvdW5kcy5tb3ZlKC1vcHRpb25zLm9mZnNldCk7CiAg
ICAgUmVnaW9uIG92ZXJsYXBSZWdpb247CiAgICAgUmVnaW9uIG5vbk92ZXJsYXBSZWdpb247Ci0g
ICAgY29tcHV0ZU92ZXJsYXBSZWdpb25zKG92ZXJsYXBSZWdpb24sIG5vbk92ZXJsYXBSZWdpb24s
IFJlc29sdmVTZWxmT3ZlcmxhcEFsd2F5cyk7CisgICAgY29tcHV0ZU92ZXJsYXBSZWdpb25zKG92
ZXJsYXBSZWdpb24sIG5vbk92ZXJsYXBSZWdpb24sIFJlc29sdmVTZWxmT3ZlcmxhcEFsd2F5cywg
Y2xpcEJvdW5kcyk7CiAgICAgaWYgKG92ZXJsYXBSZWdpb24uaXNFbXB0eSgpKSB7CiAgICAgICAg
IHBhaW50U2VsZkFuZENoaWxkcmVuV2l0aFJlcGxpY2Eob3B0aW9ucyk7CiAgICAgICAgIHJldHVy
bjsKQEAgLTQwMiw5ICs0MDYsNiBAQCB2b2lkIFRleHR1cmVNYXBwZXJMYXllcjo6cGFpbnRVc2lu
Z092ZXJsYXBSZWdpb25zKGNvbnN0IFRleHR1cmVNYXBwZXJQYWludE9wdGlvbgogICAgIGF1dG8g
cmVjdHMgPSBub25PdmVybGFwUmVnaW9uLnJlY3RzKCk7CiAKICAgICBmb3IgKGF1dG8mIHJlY3Qg
OiByZWN0cykgewotICAgICAgICBpZiAoIXJlY3QuaW50ZXJzZWN0cyhvcHRpb25zLnRleHR1cmVN
YXBwZXIuY2xpcEJvdW5kcygpKSkKLSAgICAgICAgICAgIGNvbnRpbnVlOwotCiAgICAgICAgIG9w
dGlvbnMudGV4dHVyZU1hcHBlci5iZWdpbkNsaXAoVHJhbnNmb3JtYXRpb25NYXRyaXgoKSwgcmVj
dCk7CiAgICAgICAgIHBhaW50U2VsZkFuZENoaWxkcmVuV2l0aFJlcGxpY2Eob3B0aW9ucyk7CiAg
ICAgICAgIG9wdGlvbnMudGV4dHVyZU1hcHBlci5lbmRDbGlwKCk7CkBAIC00MTgsMTUgKzQxOSwx
MSBAQCB2b2lkIFRleHR1cmVNYXBwZXJMYXllcjo6cGFpbnRVc2luZ092ZXJsYXBSZWdpb25zKGNv
bnN0IFRleHR1cmVNYXBwZXJQYWludE9wdGlvbgogICAgIH0KIAogICAgIEludFNpemUgbWF4VGV4
dHVyZVNpemUgPSBvcHRpb25zLnRleHR1cmVNYXBwZXIubWF4VGV4dHVyZVNpemUoKTsKLSAgICBJ
bnRSZWN0IGFkanVzdGVkQ2xpcEJvdW5kcyhvcHRpb25zLnRleHR1cmVNYXBwZXIuY2xpcEJvdW5k
cygpKTsKLSAgICBhZGp1c3RlZENsaXBCb3VuZHMubW92ZSgtb3B0aW9ucy5vZmZzZXQpOwogICAg
IGZvciAoYXV0byYgcmVjdCA6IHJlY3RzKSB7CiAgICAgICAgIGZvciAoaW50IHggPSByZWN0Lngo
KTsgeCA8IHJlY3QubWF4WCgpOyB4ICs9IG1heFRleHR1cmVTaXplLndpZHRoKCkpIHsKICAgICAg
ICAgICAgIGZvciAoaW50IHkgPSByZWN0LnkoKTsgeSA8IHJlY3QubWF4WSgpOyB5ICs9IG1heFRl
eHR1cmVTaXplLmhlaWdodCgpKSB7CiAgICAgICAgICAgICAgICAgSW50UmVjdCB0aWxlUmVjdChJ
bnRQb2ludCh4LCB5KSwgbWF4VGV4dHVyZVNpemUpOwogICAgICAgICAgICAgICAgIHRpbGVSZWN0
LmludGVyc2VjdChyZWN0KTsKLSAgICAgICAgICAgICAgICBpZiAoIXRpbGVSZWN0LmludGVyc2Vj
dHMoYWRqdXN0ZWRDbGlwQm91bmRzKSkKLSAgICAgICAgICAgICAgICAgICAgY29udGludWU7CiAK
ICAgICAgICAgICAgICAgICBwYWludFdpdGhJbnRlcm1lZGlhdGVTdXJmYWNlKG9wdGlvbnMsIHRp
bGVSZWN0KTsKICAgICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm
b3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIuaCBiL1NvdXJjZS9XZWJDb3Jl
L3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIuaAppbmRleCA2ZDIz
ZTQ0Njc5YjE3OWMyOGFhZjlkN2Q1YTFiY2FhNmVkODY4MTRiLi5hNmM2MTI5NmMzZWZiOGUwMWIy
MDZhODU5YTY3MmI1NTliZDUxMzAyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y
bS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmgKKysrIGIvU291cmNlL1dlYkNv
cmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJMYXllci5oCkBAIC0xMjcs
NyArMTI3LDcgQEAgcHJpdmF0ZToKICAgICAgICAgUmVzb2x2ZVNlbGZPdmVybGFwQWx3YXlzID0g
MCwKICAgICAgICAgUmVzb2x2ZVNlbGZPdmVybGFwSWZOZWVkZWQKICAgICB9OwotICAgIHZvaWQg
Y29tcHV0ZU92ZXJsYXBSZWdpb25zKFJlZ2lvbiYgb3ZlcmxhcFJlZ2lvbiwgUmVnaW9uJiBub25P
dmVybGFwUmVnaW9uLCBSZXNvbHZlU2VsZk92ZXJsYXBNb2RlKTsKKyAgICB2b2lkIGNvbXB1dGVP
dmVybGFwUmVnaW9ucyhSZWdpb24mIG92ZXJsYXBSZWdpb24sIFJlZ2lvbiYgbm9uT3ZlcmxhcFJl
Z2lvbiwgUmVzb2x2ZVNlbGZPdmVybGFwTW9kZSwgY29uc3QgSW50UmVjdCYgY2xpcEJvdW5kcyk7
CiAKICAgICB2b2lkIHBhaW50UmVjdXJzaXZlKGNvbnN0IFRleHR1cmVNYXBwZXJQYWludE9wdGlv
bnMmKTsKICAgICB2b2lkIHBhaW50VXNpbmdPdmVybGFwUmVnaW9ucyhjb25zdCBUZXh0dXJlTWFw
cGVyUGFpbnRPcHRpb25zJik7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9M
YXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZGVkN2YyNmE2NmEyMDdmOTFmOGY2NDdiMGU5ZDM1
Yzg4ZjhhNmJkYy4uNjNjOTE0ODBjZDdhMDcwYTYyZmZlNzJmNDk3NGQ0ZjhkMjkzMDRlNyAxMDA2
NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxv
ZwpAQCAtMSwzICsxLDE0IEBACisyMDIwLTEwLTE1ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3Jp
LkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFtUZXh0dXJlTWFwcGVyXSBDcmFzaGVkIGluIFRl
eHR1cmVNYXBwZXJMYXllcjo6cGFpbnRVc2luZ092ZXJsYXBSZWdpb25zCisgICAgICAgIGh0dHBz
Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQ4MTcKKyAgICAgICAgPHJkYXI6
Ly9wcm9ibGVtLzY2NDg5MDkwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp
LgorCisgICAgICAgICogY29tcG9zaXRpbmcvdGlsaW5nL2h1Z2UtbGF5ZXItd2l0aC1vcGFjaXR5
LWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGNvbXBvc2l0aW5nL3RpbGluZy9odWdl
LWxheWVyLXdpdGgtb3BhY2l0eS5odG1sOiBBZGRlZC4KKwogMjAyMC0xMC0xNSAgVHJ1aXR0IFNh
dmVsbCAgPHRzYXZlbGxAYXBwbGUuY29tPgogCiAgICAgICAgIFJlYmFzZWxpbmUgdGVzdHMgZm9y
IENhdGFsaW5hIGFuZCBpT1MgYWZ0ZXIgdGhlIGNoYW5nZXMgaW4gcjI2ODUyMApkaWZmIC0tZ2l0
IGEvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvdGlsaW5nL2h1Z2UtbGF5ZXItd2l0aC1vcGFjaXR5
LWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy90aWxpbmcvaHVnZS1sYXll
ci13aXRoLW9wYWNpdHktZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wMGJhNDUyODE5ZDNlMzc2
ZGZhY2U4ZWJlOGU5MTMxNTRmNzBkMzIxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMv
Y29tcG9zaXRpbmcvdGlsaW5nL2h1Z2UtbGF5ZXItd2l0aC1vcGFjaXR5LWV4cGVjdGVkLmh0bWwK
QEAgLTAsMCArMSwyNCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKyAgICA8aGVhZD4KKyAg
ICAgICAgPG1ldGEgY2hhcnNldD0idXRmLTgiPgorICAgICAgICA8c3R5bGU+CisgICAgICAgICAg
ICBkaXYgeworICAgICAgICAgICAgICAgIHdpZHRoOiAxMDAwMDBweDsKKyAgICAgICAgICAgICAg
ICBoZWlnaHQ6IDEwMDAwMHB4OworICAgICAgICAgICAgICAgIGJhY2tncm91bmQ6IGdyZWVuOwor
ICAgICAgICAgICAgICAgIGJvcmRlcjogMTBweCBzb2xpZCBibHVlOworICAgICAgICAgICAgICAg
IG9wYWNpdHk6IDAuNTsKKyAgICAgICAgICAgICAgICB3aWxsLWNoYW5nZTogdHJhbnNmb3JtOwor
ICAgICAgICAgICAgfQorICAgICAgICA8L3N0eWxlPgorICAgIDwvaGVhZD4KKyAgICA8Ym9keT4K
KyAgICAgICAgUmVuZGVyaW5nIGEgaHVnZSBvcGFjaXR5IGxheWVyIHNob3VsZG4ndCBjcmFzaCA8
YSBocmVmPSJodHRwczovL3dlYmtpdC5vcmcvYi8yMTQ4MTciPkJ1ZyAyMTQ4MTc8L2E+LgorICAg
ICAgICA8ZGl2PgorICAgICAgICAgICAgPGRpdj4KKyAgICAgICAgICAgICAgICA8ZGl2PjwvZGl2
PgorICAgICAgICAgICAgPC9kaXY+CisgICAgICAgIDwvZGl2PgorICAgIDwvYm9keT4KKzwvaHRt
bD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL3RpbGluZy9odWdlLWxheWVy
LXdpdGgtb3BhY2l0eS5odG1sIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvdGlsaW5nL2h1Z2Ut
bGF5ZXItd2l0aC1vcGFjaXR5Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMDBiYTQ1MjgxOWQzZTM3NmRmYWNl
OGViZThlOTEzMTU0ZjcwZDMyMQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NvbXBv
c2l0aW5nL3RpbGluZy9odWdlLWxheWVyLXdpdGgtb3BhY2l0eS5odG1sCkBAIC0wLDAgKzEsMjQg
QEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+CisgICAgPGhlYWQ+CisgICAgICAgIDxtZXRhIGNo
YXJzZXQ9InV0Zi04Ij4KKyAgICAgICAgPHN0eWxlPgorICAgICAgICAgICAgZGl2IHsKKyAgICAg
ICAgICAgICAgICB3aWR0aDogMTAwMDAwcHg7CisgICAgICAgICAgICAgICAgaGVpZ2h0OiAxMDAw
MDBweDsKKyAgICAgICAgICAgICAgICBiYWNrZ3JvdW5kOiBncmVlbjsKKyAgICAgICAgICAgICAg
ICBib3JkZXI6IDEwcHggc29saWQgYmx1ZTsKKyAgICAgICAgICAgICAgICBvcGFjaXR5OiAwLjU7
CisgICAgICAgICAgICAgICAgd2lsbC1jaGFuZ2U6IHRyYW5zZm9ybTsKKyAgICAgICAgICAgIH0K
KyAgICAgICAgPC9zdHlsZT4KKyAgICA8L2hlYWQ+CisgICAgPGJvZHk+CisgICAgICAgIFJlbmRl
cmluZyBhIGh1Z2Ugb3BhY2l0eSBsYXllciBzaG91bGRuJ3QgY3Jhc2ggPGEgaHJlZj0iaHR0cHM6
Ly93ZWJraXQub3JnL2IvMjE0ODE3Ij5CdWcgMjE0ODE3PC9hPi4KKyAgICAgICAgPGRpdj4KKyAg
ICAgICAgICAgIDxkaXY+CisgICAgICAgICAgICAgICAgPGRpdj48L2Rpdj4KKyAgICAgICAgICAg
IDwvZGl2PgorICAgICAgICA8L2Rpdj4KKyAgICA8L2JvZHk+Cis8L2h0bWw+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>412499</attachid>
            <date>2020-10-27 19:36:46 -0700</date>
            <delta_ts>2020-10-30 15:17:37 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-214817-20201028113645.patch</filename>
            <type>text/plain</type>
            <size>9111</size>
            <attacher name="Fujii Hironori">fujii</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5MDg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjJjYmU0OGFjYzQ3ZDE1
ZGY4YjhhZWI1ZDg5NjUxYjI3Mzc0OThjZS4uZDZjMjQ2NDU5ODFmMDM0ZmMyYmQzOWZlMDhmNzgy
MTU5NGQ3OTJlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIwLTEwLTI3ICBGdWpp
aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFtUZXh0dXJl
TWFwcGVyXSBDcmFzaGVkIGluIFRleHR1cmVNYXBwZXJMYXllcjo6cGFpbnRVc2luZ092ZXJsYXBS
ZWdpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y
MTQ4MTcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY2NDg5MDkwPgorCisgICAgICAgIFJldmll
d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRleHR1cmVNYXBwZXJMYXllcjo6cGFp
bnRVc2luZ092ZXJsYXBSZWdpb25zIGhhcyB0aGUgZXhwcmVzc2lvbgorICAgICAgICBgb3Zlcmxh
cFJlZ2lvbi5ib3VuZHMoKS5zaXplKCkuYXJlYSgpYCB3aGljaCBjcmFzaGVzIGZvciBhIHZlcnkK
KyAgICAgICAgbGFyZ2UgbGF5ZXIuCisKKyAgICAgICAgY29tcHV0ZU92ZXJsYXBSZWdpb25zIHJl
dHVybmVkIHZlcnkgbGFyZ2Ugb3ZlcmxhcCBhbmQgbm9uLW92ZXJsYXAKKyAgICAgICAgcmVnaW9u
cyB3aXRob3V0IHRha2luZyB0aGUgY2xpcCBib3VuZHMgaW50byBhY2NvdW50LgorCisgICAgICAg
IENoYW5nZSBjb21wdXRlT3ZlcmxhcFJlZ2lvbnMgdG8gdGFrZSB0aGUgY2xpcCBib3VuZHMgYXMg
YSBhcmd1bWVudAorICAgICAgICBhbmQgcmV0dXJuIGNsaXBwZWQgcmVnaW9ucy4KKworICAgICAg
ICBUZXN0OiBjb21wb3NpdGluZy90aWxpbmcvaHVnZS1sYXllci13aXRoLW9wYWNpdHkuaHRtbAor
CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJMYXllci5j
cHA6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyTGF5ZXI6OmNvbXB1dGVPdmVybGFw
UmVnaW9ucyk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyTGF5ZXI6OnBhaW50VXNp
bmdPdmVybGFwUmVnaW9ucyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1Rl
eHR1cmVNYXBwZXJMYXllci5oOgorCiAyMDIwLTEwLTI3ICBTYWlkIEFib3UtSGFsbGF3YSAgPHNh
aWRAYXBwbGUuY29tPgogCiAgICAgICAgIE1ha2UgUmVuZGVyaW5nTW9kZSBhIGJvb2wgZW51bSBh
bmQgcmVtb3ZlIFNob3VsZEFjY2VsZXJhdGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs
YXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIuY3BwIGIvU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJMYXllci5jcHAKaW5k
ZXggNzYwNTMzNjYxMDEwM2M1M2Q3Mzk1MDgxY2I0NGIyOTc3NDIyMzI1Yi4uOTIxMzA1MDU2ZTRm
NmYxZWEyNTBhNjU1NmVkYTZhYTdlMWZlOTcwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv
cGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJMYXllci5jcHAKKysrIGIvU291
cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJMYXllci5j
cHAKQEAgLTMyNSw3ICszMjUsNyBAQCBzdGF0aWMgdm9pZCByZXNvbHZlT3ZlcmxhcHMoUmVnaW9u
JiBuZXdSZWdpb24sIFJlZ2lvbiYgb3ZlcmxhcFJlZ2lvbiwgUmVnaW9uJiBubwogICAgIG5vbk92
ZXJsYXBSZWdpb24udW5pdGUobmV3UmVnaW9uKTsKIH0KIAotdm9pZCBUZXh0dXJlTWFwcGVyTGF5
ZXI6OmNvbXB1dGVPdmVybGFwUmVnaW9ucyhSZWdpb24mIG92ZXJsYXBSZWdpb24sIFJlZ2lvbiYg
bm9uT3ZlcmxhcFJlZ2lvbiwgUmVzb2x2ZVNlbGZPdmVybGFwTW9kZSBtb2RlKQordm9pZCBUZXh0
dXJlTWFwcGVyTGF5ZXI6OmNvbXB1dGVPdmVybGFwUmVnaW9ucyhSZWdpb24mIG92ZXJsYXBSZWdp
b24sIFJlZ2lvbiYgbm9uT3ZlcmxhcFJlZ2lvbiwgUmVzb2x2ZVNlbGZPdmVybGFwTW9kZSBtb2Rl
LCBjb25zdCBJbnRSZWN0JiBjbGlwQm91bmRzKQogewogICAgIGlmICghbV9zdGF0ZS52aXNpYmxl
IHx8ICFtX3N0YXRlLmNvbnRlbnRzVmlzaWJsZSkKICAgICAgICAgcmV0dXJuOwpAQCAtMzUwLDIy
ICszNTAsMjMgQEAgdm9pZCBUZXh0dXJlTWFwcGVyTGF5ZXI6OmNvbXB1dGVPdmVybGFwUmVnaW9u
cyhSZWdpb24mIG92ZXJsYXBSZWdpb24sIFJlZ2lvbiYgbm8KICAgICAgICAgYm91bmRpbmdSZWN0
LnVuaXRlKHJlcGxpY2FNYXRyaXgubWFwUmVjdChib3VuZGluZ1JlY3QpKTsKICAgICB9CiAKLSAg
ICBib3VuZGluZ1JlY3QgPSBtX2xheWVyVHJhbnNmb3Jtcy5jb21iaW5lZC5tYXBSZWN0KGJvdW5k
aW5nUmVjdCk7CisgICAgSW50UmVjdCB2aWV3cG9ydEJvdW5kaW5nUmVjdCA9IGVuY2xvc2luZ0lu
dFJlY3QobV9sYXllclRyYW5zZm9ybXMuY29tYmluZWQubWFwUmVjdChib3VuZGluZ1JlY3QpKTsK
KyAgICB2aWV3cG9ydEJvdW5kaW5nUmVjdC5pbnRlcnNlY3QoY2xpcEJvdW5kcyk7CiAKICAgICAv
LyBDb3VudCBhbGwgbWFza3MgYW5kIGZpbHRlcnMgYXMgb3ZlcmxhcCBsYXllcnMuCiAgICAgaWYg
KGhhc0ZpbHRlcnMoKSB8fCBtX3N0YXRlLm1hc2tMYXllciB8fCAobV9zdGF0ZS5yZXBsaWNhTGF5
ZXIgJiYgbV9zdGF0ZS5yZXBsaWNhTGF5ZXItPm1fc3RhdGUubWFza0xheWVyKSkgewotICAgICAg
ICBSZWdpb24gbmV3T3ZlcmxhcFJlZ2lvbihlbmNsb3NpbmdJbnRSZWN0KGJvdW5kaW5nUmVjdCkp
OworICAgICAgICBSZWdpb24gbmV3T3ZlcmxhcFJlZ2lvbih2aWV3cG9ydEJvdW5kaW5nUmVjdCk7
CiAgICAgICAgIG5vbk92ZXJsYXBSZWdpb24uc3VidHJhY3QobmV3T3ZlcmxhcFJlZ2lvbik7CiAg
ICAgICAgIG92ZXJsYXBSZWdpb24udW5pdGUobmV3T3ZlcmxhcFJlZ2lvbik7CiAgICAgICAgIHJl
dHVybjsKICAgICB9CiAKICAgICBSZWdpb24gbmV3T3ZlcmxhcFJlZ2lvbjsKLSAgICBSZWdpb24g
bmV3Tm9uT3ZlcmxhcFJlZ2lvbihlbmNsb3NpbmdJbnRSZWN0KGJvdW5kaW5nUmVjdCkpOworICAg
IFJlZ2lvbiBuZXdOb25PdmVybGFwUmVnaW9uKHZpZXdwb3J0Qm91bmRpbmdSZWN0KTsKIAogICAg
IGlmICghbV9zdGF0ZS5tYXNrc1RvQm91bmRzKSB7CiAgICAgICAgIGZvciAoYXV0byogY2hpbGQg
OiBtX2NoaWxkcmVuKQotICAgICAgICAgICAgY2hpbGQtPmNvbXB1dGVPdmVybGFwUmVnaW9ucyhu
ZXdPdmVybGFwUmVnaW9uLCBuZXdOb25PdmVybGFwUmVnaW9uLCBSZXNvbHZlU2VsZk92ZXJsYXBJ
Zk5lZWRlZCk7CisgICAgICAgICAgICBjaGlsZC0+Y29tcHV0ZU92ZXJsYXBSZWdpb25zKG5ld092
ZXJsYXBSZWdpb24sIG5ld05vbk92ZXJsYXBSZWdpb24sIFJlc29sdmVTZWxmT3ZlcmxhcElmTmVl
ZGVkLCBjbGlwQm91bmRzKTsKICAgICB9CiAKICAgICBpZiAobV9zdGF0ZS5yZXBsaWNhTGF5ZXIp
IHsKQEAgLTM4NSw5ICszODYsMTIgQEAgdm9pZCBUZXh0dXJlTWFwcGVyTGF5ZXI6OmNvbXB1dGVP
dmVybGFwUmVnaW9ucyhSZWdpb24mIG92ZXJsYXBSZWdpb24sIFJlZ2lvbiYgbm8KIAogdm9pZCBU
ZXh0dXJlTWFwcGVyTGF5ZXI6OnBhaW50VXNpbmdPdmVybGFwUmVnaW9ucyhjb25zdCBUZXh0dXJl
TWFwcGVyUGFpbnRPcHRpb25zJiBvcHRpb25zKQogeworICAgIC8vIGNsaXBCb3VuZHMgY2FuIGJl
IGluIHRoZSB0YXJnZXQgdGV4dHVyZSBsb2NhbCBjb29yZGluYXRlIHN5c3RlbS4gQ29udmVydCBp
dCB0byB0aGUgdmlld3BvcnQgY29vcmRpbmF0ZSBzeXN0ZW0uCisgICAgSW50UmVjdCBjbGlwQm91
bmRzKG9wdGlvbnMudGV4dHVyZU1hcHBlci5jbGlwQm91bmRzKCkpOworICAgIGNsaXBCb3VuZHMu
bW92ZSgtb3B0aW9ucy5vZmZzZXQpOwogICAgIFJlZ2lvbiBvdmVybGFwUmVnaW9uOwogICAgIFJl
Z2lvbiBub25PdmVybGFwUmVnaW9uOwotICAgIGNvbXB1dGVPdmVybGFwUmVnaW9ucyhvdmVybGFw
UmVnaW9uLCBub25PdmVybGFwUmVnaW9uLCBSZXNvbHZlU2VsZk92ZXJsYXBBbHdheXMpOworICAg
IGNvbXB1dGVPdmVybGFwUmVnaW9ucyhvdmVybGFwUmVnaW9uLCBub25PdmVybGFwUmVnaW9uLCBS
ZXNvbHZlU2VsZk92ZXJsYXBBbHdheXMsIGNsaXBCb3VuZHMpOwogICAgIGlmIChvdmVybGFwUmVn
aW9uLmlzRW1wdHkoKSkgewogICAgICAgICBwYWludFNlbGZBbmRDaGlsZHJlbldpdGhSZXBsaWNh
KG9wdGlvbnMpOwogICAgICAgICByZXR1cm47CkBAIC00MDQsOSArNDA4LDYgQEAgdm9pZCBUZXh0
dXJlTWFwcGVyTGF5ZXI6OnBhaW50VXNpbmdPdmVybGFwUmVnaW9ucyhjb25zdCBUZXh0dXJlTWFw
cGVyUGFpbnRPcHRpb24KICAgICBhdXRvIHJlY3RzID0gbm9uT3ZlcmxhcFJlZ2lvbi5yZWN0cygp
OwogCiAgICAgZm9yIChhdXRvJiByZWN0IDogcmVjdHMpIHsKLSAgICAgICAgaWYgKCFyZWN0Lmlu
dGVyc2VjdHMob3B0aW9ucy50ZXh0dXJlTWFwcGVyLmNsaXBCb3VuZHMoKSkpCi0gICAgICAgICAg
ICBjb250aW51ZTsKLQogICAgICAgICBvcHRpb25zLnRleHR1cmVNYXBwZXIuYmVnaW5DbGlwKFRy
YW5zZm9ybWF0aW9uTWF0cml4KCksIEZsb2F0Um91bmRlZFJlY3QocmVjdCkpOwogICAgICAgICBw
YWludFNlbGZBbmRDaGlsZHJlbldpdGhSZXBsaWNhKG9wdGlvbnMpOwogICAgICAgICBvcHRpb25z
LnRleHR1cmVNYXBwZXIuZW5kQ2xpcCgpOwpAQCAtNDIwLDE1ICs0MjEsMTEgQEAgdm9pZCBUZXh0
dXJlTWFwcGVyTGF5ZXI6OnBhaW50VXNpbmdPdmVybGFwUmVnaW9ucyhjb25zdCBUZXh0dXJlTWFw
cGVyUGFpbnRPcHRpb24KICAgICB9CiAKICAgICBJbnRTaXplIG1heFRleHR1cmVTaXplID0gb3B0
aW9ucy50ZXh0dXJlTWFwcGVyLm1heFRleHR1cmVTaXplKCk7Ci0gICAgSW50UmVjdCBhZGp1c3Rl
ZENsaXBCb3VuZHMob3B0aW9ucy50ZXh0dXJlTWFwcGVyLmNsaXBCb3VuZHMoKSk7Ci0gICAgYWRq
dXN0ZWRDbGlwQm91bmRzLm1vdmUoLW9wdGlvbnMub2Zmc2V0KTsKICAgICBmb3IgKGF1dG8mIHJl
Y3QgOiByZWN0cykgewogICAgICAgICBmb3IgKGludCB4ID0gcmVjdC54KCk7IHggPCByZWN0Lm1h
eFgoKTsgeCArPSBtYXhUZXh0dXJlU2l6ZS53aWR0aCgpKSB7CiAgICAgICAgICAgICBmb3IgKGlu
dCB5ID0gcmVjdC55KCk7IHkgPCByZWN0Lm1heFkoKTsgeSArPSBtYXhUZXh0dXJlU2l6ZS5oZWln
aHQoKSkgewogICAgICAgICAgICAgICAgIEludFJlY3QgdGlsZVJlY3QoSW50UG9pbnQoeCwgeSks
IG1heFRleHR1cmVTaXplKTsKICAgICAgICAgICAgICAgICB0aWxlUmVjdC5pbnRlcnNlY3QocmVj
dCk7Ci0gICAgICAgICAgICAgICAgaWYgKCF0aWxlUmVjdC5pbnRlcnNlY3RzKGFkanVzdGVkQ2xp
cEJvdW5kcykpCi0gICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogCiAgICAgICAgICAgICAg
ICAgcGFpbnRXaXRoSW50ZXJtZWRpYXRlU3VyZmFjZShvcHRpb25zLCB0aWxlUmVjdCk7CiAgICAg
ICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90
ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw
aGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmgKaW5kZXggZDNmZDE3NjQzOTBhMjYwZDZm
NzYxMWY5NTdlNzNkNzdmNjg3MThjNC4uYTU5NjU4ZDY3NGEzOTk1YmVkNTM0N2M2YzRlMGM0ZTdl
ZjYzMGE3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4
bWFwL1RleHR1cmVNYXBwZXJMYXllci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy
YXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIuaApAQCAtMTI3LDcgKzEyNyw3IEBAIHBy
aXZhdGU6CiAgICAgICAgIFJlc29sdmVTZWxmT3ZlcmxhcEFsd2F5cyA9IDAsCiAgICAgICAgIFJl
c29sdmVTZWxmT3ZlcmxhcElmTmVlZGVkCiAgICAgfTsKLSAgICB2b2lkIGNvbXB1dGVPdmVybGFw
UmVnaW9ucyhSZWdpb24mIG92ZXJsYXBSZWdpb24sIFJlZ2lvbiYgbm9uT3ZlcmxhcFJlZ2lvbiwg
UmVzb2x2ZVNlbGZPdmVybGFwTW9kZSk7CisgICAgdm9pZCBjb21wdXRlT3ZlcmxhcFJlZ2lvbnMo
UmVnaW9uJiBvdmVybGFwUmVnaW9uLCBSZWdpb24mIG5vbk92ZXJsYXBSZWdpb24sIFJlc29sdmVT
ZWxmT3ZlcmxhcE1vZGUsIGNvbnN0IEludFJlY3QmIGNsaXBCb3VuZHMpOwogCiAgICAgdm9pZCBw
YWludFJlY3Vyc2l2ZShjb25zdCBUZXh0dXJlTWFwcGVyUGFpbnRPcHRpb25zJik7CiAgICAgdm9p
ZCBwYWludFVzaW5nT3ZlcmxhcFJlZ2lvbnMoY29uc3QgVGV4dHVyZU1hcHBlclBhaW50T3B0aW9u
cyYpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hh
bmdlTG9nCmluZGV4IDY0NGU2MTRmYTFjODYyMDFhM2M2NzdkZWE3Nzg1MDJhYzY5YzI2NDQuLmE3
Y2U2NDQ2Y2YzMjcxN2Q5ZTJjMjBlNjRjNWFlNTIwYzcxMTNhZDMgMTAwNjQ0Ci0tLSBhL0xheW91
dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx
NCBAQAorMjAyMC0xMC0yNyAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNv
bT4KKworICAgICAgICBbVGV4dHVyZU1hcHBlcl0gQ3Jhc2hlZCBpbiBUZXh0dXJlTWFwcGVyTGF5
ZXI6OnBhaW50VXNpbmdPdmVybGFwUmVnaW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0
Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE0ODE3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82NjQ4
OTA5MD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq
IGNvbXBvc2l0aW5nL3RpbGluZy9odWdlLWxheWVyLXdpdGgtb3BhY2l0eS1leHBlY3RlZC5odG1s
OiBBZGRlZC4KKyAgICAgICAgKiBjb21wb3NpdGluZy90aWxpbmcvaHVnZS1sYXllci13aXRoLW9w
YWNpdHkuaHRtbDogQWRkZWQuCisKIDIwMjAtMTAtMjcgIENhcmxvcyBBbGJlcnRvIExvcGV6IFBl
cmV6ICA8Y2xvcGV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS11bV1BFXSBSZWJhc2VsaW5l
IHRlc3RzIGFmdGVyIHIyNjkwNDQgYW5kIHIyNjkwMzYKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz
L2NvbXBvc2l0aW5nL3RpbGluZy9odWdlLWxheWVyLXdpdGgtb3BhY2l0eS1leHBlY3RlZC5odG1s
IGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvdGlsaW5nL2h1Z2UtbGF5ZXItd2l0aC1vcGFjaXR5
LWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZTdiN2JiOTdjZmY4ZDVlOGRkYjQzMzcwYjQ2YjI4
OTljZWE0Njk5OQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL3Rp
bGluZy9odWdlLWxheWVyLXdpdGgtb3BhY2l0eS1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsMjMg
QEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+CisgICAgPGhlYWQ+CisgICAgICAgIDxtZXRhIGNo
YXJzZXQ9InV0Zi04Ij4KKyAgICAgICAgPHN0eWxlPgorICAgICAgICAgICAgZGl2IHsKKyAgICAg
ICAgICAgICAgICB3aWR0aDogMTAwMDAwcHg7CisgICAgICAgICAgICAgICAgaGVpZ2h0OiAxMDAw
MDBweDsKKyAgICAgICAgICAgICAgICBiYWNrZ3JvdW5kOiBncmVlbjsKKyAgICAgICAgICAgICAg
ICBib3JkZXI6IDEwcHggc29saWQgYmx1ZTsKKyAgICAgICAgICAgICAgICBvcGFjaXR5OiAwLjU7
CisgICAgICAgICAgICB9CisgICAgICAgIDwvc3R5bGU+CisgICAgPC9oZWFkPgorICAgIDxib2R5
PgorICAgICAgICBSZW5kZXJpbmcgYSBodWdlIG9wYWNpdHkgbGF5ZXIgc2hvdWxkbid0IGNyYXNo
IDxhIGhyZWY9Imh0dHBzOi8vd2Via2l0Lm9yZy9iLzIxNDgxNyI+QnVnIDIxNDgxNzwvYT4uCisg
ICAgICAgIDxkaXY+CisgICAgICAgICAgICA8ZGl2PgorICAgICAgICAgICAgICAgIDxkaXY+PC9k
aXY+CisgICAgICAgICAgICA8L2Rpdj4KKyAgICAgICAgPC9kaXY+CisgICAgPC9ib2R5PgorPC9o
dG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvdGlsaW5nL2h1Z2UtbGF5
ZXItd2l0aC1vcGFjaXR5Lmh0bWwgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy90aWxpbmcvaHVn
ZS1sYXllci13aXRoLW9wYWNpdHkuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wMGJhNDUyODE5ZDNlMzc2ZGZh
Y2U4ZWJlOGU5MTMxNTRmNzBkMzIxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvY29t
cG9zaXRpbmcvdGlsaW5nL2h1Z2UtbGF5ZXItd2l0aC1vcGFjaXR5Lmh0bWwKQEAgLTAsMCArMSwy
NCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKyAgICA8aGVhZD4KKyAgICAgICAgPG1ldGEg
Y2hhcnNldD0idXRmLTgiPgorICAgICAgICA8c3R5bGU+CisgICAgICAgICAgICBkaXYgeworICAg
ICAgICAgICAgICAgIHdpZHRoOiAxMDAwMDBweDsKKyAgICAgICAgICAgICAgICBoZWlnaHQ6IDEw
MDAwMHB4OworICAgICAgICAgICAgICAgIGJhY2tncm91bmQ6IGdyZWVuOworICAgICAgICAgICAg
ICAgIGJvcmRlcjogMTBweCBzb2xpZCBibHVlOworICAgICAgICAgICAgICAgIG9wYWNpdHk6IDAu
NTsKKyAgICAgICAgICAgICAgICB3aWxsLWNoYW5nZTogdHJhbnNmb3JtOworICAgICAgICAgICAg
fQorICAgICAgICA8L3N0eWxlPgorICAgIDwvaGVhZD4KKyAgICA8Ym9keT4KKyAgICAgICAgUmVu
ZGVyaW5nIGEgaHVnZSBvcGFjaXR5IGxheWVyIHNob3VsZG4ndCBjcmFzaCA8YSBocmVmPSJodHRw
czovL3dlYmtpdC5vcmcvYi8yMTQ4MTciPkJ1ZyAyMTQ4MTc8L2E+LgorICAgICAgICA8ZGl2Pgor
ICAgICAgICAgICAgPGRpdj4KKyAgICAgICAgICAgICAgICA8ZGl2PjwvZGl2PgorICAgICAgICAg
ICAgPC9kaXY+CisgICAgICAgIDwvZGl2PgorICAgIDwvYm9keT4KKzwvaHRtbD4K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>412804</attachid>
            <date>2020-10-30 15:17:40 -0700</date>
            <delta_ts>2020-10-31 13:14:11 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-214817-20201031071739.patch</filename>
            <type>text/plain</type>
            <size>8484</size>
            <attacher name="Fujii Hironori">fujii</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5MjA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDM1MzhmYWVlNjkyMDc3
NmVhNTdjY2U0YjNhN2FkMDIxYmFkNTNhNy4uOGViZTVjYzgxNDZlYzY0MmM3YTVjMTY3ZjYwODAz
MmQ0YWIzOTgwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIwLTEwLTMwICBGdWpp
aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFtUZXh0dXJl
TWFwcGVyXSBDcmFzaGVkIGluIFRleHR1cmVNYXBwZXJMYXllcjo6cGFpbnRVc2luZ092ZXJsYXBS
ZWdpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y
MTQ4MTcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY2NDg5MDkwPgorCisgICAgICAgIFJldmll
d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRleHR1cmVNYXBwZXJMYXllcjo6cGFp
bnRVc2luZ092ZXJsYXBSZWdpb25zIGhhcyB0aGUgZXhwcmVzc2lvbgorICAgICAgICBgb3Zlcmxh
cFJlZ2lvbi5ib3VuZHMoKS5zaXplKCkuYXJlYSgpYCB3aGljaCBjcmFzaGVzIGZvciBhIHZlcnkK
KyAgICAgICAgbGFyZ2UgbGF5ZXIuCisKKyAgICAgICAgY29tcHV0ZU92ZXJsYXBSZWdpb25zIHJl
dHVybmVkIHZlcnkgbGFyZ2Ugb3ZlcmxhcCBhbmQgbm9uLW92ZXJsYXAKKyAgICAgICAgcmVnaW9u
cyB3aXRob3V0IHRha2luZyB0aGUgY2xpcCBib3VuZHMgaW50byBhY2NvdW50LgorCisgICAgICAg
IENoYW5nZSBjb21wdXRlT3ZlcmxhcFJlZ2lvbnMgdG8gcmV0dXJuIGNsaXBwZWQgcmVnaW9ucy4K
KyAgICAgICAgcGFpbnRVc2luZ092ZXJsYXBSZWdpb25zIG5vIGxvbmdlciBuZWVkcyB0byBjbGlw
IHRoZSByZXR1cm5lZAorICAgICAgICByZWdpb25zLgorCisgICAgICAgIFRlc3Q6IGNvbXBvc2l0
aW5nL3RpbGluZy9odWdlLWxheWVyLXdpdGgtb3BhY2l0eS5odG1sCisKKyAgICAgICAgKiBwbGF0
Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmNwcDoKKyAgICAgICAgKFdl
YkNvcmU6OlRleHR1cmVNYXBwZXJMYXllcjo6Y29tcHV0ZU92ZXJsYXBSZWdpb25zKToKKyAgICAg
ICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJMYXllcjo6cGFpbnRVc2luZ092ZXJsYXBSZWdpb25z
KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVy
Lmg6CisKIDIwMjAtMTAtMzAgIEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5j
b20+CiAKICAgICAgICAgW1RleHR1cmVNYXBwZXJdIFJlcGxpY2EgbGF5ZXJzIGRvbid0IGJsZW5k
IGNvcnJlY3RseSBiZWNhdXNlIGNvbXB1dGVPdmVybGFwUmVnaW9ucyBkb2Vzbid0IHRha2UgVGV4
dHVyZU1hcHBlclBhaW50T3B0aW9uczo6dHJhbnNmb3JtIGludG8gYWNjb3VudApkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJM
YXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVy
ZU1hcHBlckxheWVyLmNwcAppbmRleCA1ZTA4YjU2ZWRkNjgwYTE0YWE2ODQ4MjNmOTQ0MmE2MjA2
NzRjN2ZlLi44MGIwZmM4OTNjYjhkMzVjYTBkZGNiMTg2Zjk5OWZmY2UwYzM1YmI3IDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBl
ckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAv
VGV4dHVyZU1hcHBlckxheWVyLmNwcApAQCAtMzMwLDE4ICszMzAsMTggQEAgdm9pZCBUZXh0dXJl
TWFwcGVyTGF5ZXI6OmNvbXB1dGVPdmVybGFwUmVnaW9ucyhjb25zdCBUZXh0dXJlTWFwcGVyUGFp
bnRPcHRpb25zJgogICAgIGlmICghbV9zdGF0ZS52aXNpYmxlIHx8ICFtX3N0YXRlLmNvbnRlbnRz
VmlzaWJsZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgRmxvYXRSZWN0IGJvdW5kaW5nUmVjdDsK
KyAgICBGbG9hdFJlY3QgbG9jYWxCb3VuZGluZ1JlY3Q7CiAgICAgaWYgKG1fYmFja2luZ1N0b3Jl
IHx8IG1fc3RhdGUubWFza3NUb0JvdW5kcyB8fCBtX3N0YXRlLm1hc2tMYXllciB8fCBoYXNGaWx0
ZXJzKCkpCi0gICAgICAgIGJvdW5kaW5nUmVjdCA9IGxheWVyUmVjdCgpOworICAgICAgICBsb2Nh
bEJvdW5kaW5nUmVjdCA9IGxheWVyUmVjdCgpOwogICAgIGVsc2UgaWYgKG1fY29udGVudHNMYXll
ciB8fCBtX3N0YXRlLnNvbGlkQ29sb3IuaXNWaXNpYmxlKCkpCi0gICAgICAgIGJvdW5kaW5nUmVj
dCA9IG1fc3RhdGUuY29udGVudHNSZWN0OworICAgICAgICBsb2NhbEJvdW5kaW5nUmVjdCA9IG1f
c3RhdGUuY29udGVudHNSZWN0OwogCiAgICAgaWYgKG1fY3VycmVudEZpbHRlcnMuaGFzT3V0c2V0
cygpKSB7CiAgICAgICAgIGF1dG8gb3V0c2V0cyA9IG1fY3VycmVudEZpbHRlcnMub3V0c2V0cygp
OwotICAgICAgICBJbnRSZWN0IHVuZmlsdGVyZWRUYXJnZXRSZWN0KGJvdW5kaW5nUmVjdCk7Ci0g
ICAgICAgIGJvdW5kaW5nUmVjdC5tb3ZlKHN0ZDo6bWF4KDAsIC1vdXRzZXRzLmxlZnQoKSksIHN0
ZDo6bWF4KDAsIC1vdXRzZXRzLnRvcCgpKSk7Ci0gICAgICAgIGJvdW5kaW5nUmVjdC5leHBhbmQo
b3V0c2V0cy5sZWZ0KCkgKyBvdXRzZXRzLnJpZ2h0KCksIG91dHNldHMudG9wKCkgKyBvdXRzZXRz
LmJvdHRvbSgpKTsKLSAgICAgICAgYm91bmRpbmdSZWN0LnVuaXRlKHVuZmlsdGVyZWRUYXJnZXRS
ZWN0KTsKKyAgICAgICAgSW50UmVjdCB1bmZpbHRlcmVkVGFyZ2V0UmVjdChsb2NhbEJvdW5kaW5n
UmVjdCk7CisgICAgICAgIGxvY2FsQm91bmRpbmdSZWN0Lm1vdmUoc3RkOjptYXgoMCwgLW91dHNl
dHMubGVmdCgpKSwgc3RkOjptYXgoMCwgLW91dHNldHMudG9wKCkpKTsKKyAgICAgICAgbG9jYWxC
b3VuZGluZ1JlY3QuZXhwYW5kKG91dHNldHMubGVmdCgpICsgb3V0c2V0cy5yaWdodCgpLCBvdXRz
ZXRzLnRvcCgpICsgb3V0c2V0cy5ib3R0b20oKSk7CisgICAgICAgIGxvY2FsQm91bmRpbmdSZWN0
LnVuaXRlKHVuZmlsdGVyZWRUYXJnZXRSZWN0KTsKICAgICB9CiAKICAgICBUcmFuc2Zvcm1hdGlv
bk1hdHJpeCB0cmFuc2Zvcm07CkBAIC0zNTEsMjEgKzM1MSwyNSBAQCB2b2lkIFRleHR1cmVNYXBw
ZXJMYXllcjo6Y29tcHV0ZU92ZXJsYXBSZWdpb25zKGNvbnN0IFRleHR1cmVNYXBwZXJQYWludE9w
dGlvbnMmCiAgICAgVHJhbnNmb3JtYXRpb25NYXRyaXggcmVwbGljYU1hdHJpeDsKICAgICBpZiAo
bV9zdGF0ZS5yZXBsaWNhTGF5ZXIpIHsKICAgICAgICAgcmVwbGljYU1hdHJpeCA9IHJlcGxpY2FU
cmFuc2Zvcm0oKTsKLSAgICAgICAgYm91bmRpbmdSZWN0LnVuaXRlKHJlcGxpY2FNYXRyaXgubWFw
UmVjdChib3VuZGluZ1JlY3QpKTsKKyAgICAgICAgbG9jYWxCb3VuZGluZ1JlY3QudW5pdGUocmVw
bGljYU1hdHJpeC5tYXBSZWN0KGxvY2FsQm91bmRpbmdSZWN0KSk7CiAgICAgfQogCi0gICAgYm91
bmRpbmdSZWN0ID0gdHJhbnNmb3JtLm1hcFJlY3QoYm91bmRpbmdSZWN0KTsKKyAgICBJbnRSZWN0
IGNsaXBCb3VuZHMob3B0aW9ucy50ZXh0dXJlTWFwcGVyLmNsaXBCb3VuZHMoKSk7CisgICAgY2xp
cEJvdW5kcy5tb3ZlKC1vcHRpb25zLm9mZnNldCk7CisKKyAgICBJbnRSZWN0IHZpZXdwb3J0Qm91
bmRpbmdSZWN0ID0gZW5jbG9zaW5nSW50UmVjdCh0cmFuc2Zvcm0ubWFwUmVjdChsb2NhbEJvdW5k
aW5nUmVjdCkpOworICAgIHZpZXdwb3J0Qm91bmRpbmdSZWN0LmludGVyc2VjdChjbGlwQm91bmRz
KTsKIAogICAgIC8vIENvdW50IGFsbCBtYXNrcyBhbmQgZmlsdGVycyBhcyBvdmVybGFwIGxheWVy
cy4KICAgICBpZiAoaGFzRmlsdGVycygpIHx8IG1fc3RhdGUubWFza0xheWVyIHx8IChtX3N0YXRl
LnJlcGxpY2FMYXllciAmJiBtX3N0YXRlLnJlcGxpY2FMYXllci0+bV9zdGF0ZS5tYXNrTGF5ZXIp
KSB7Ci0gICAgICAgIFJlZ2lvbiBuZXdPdmVybGFwUmVnaW9uKGVuY2xvc2luZ0ludFJlY3QoYm91
bmRpbmdSZWN0KSk7CisgICAgICAgIFJlZ2lvbiBuZXdPdmVybGFwUmVnaW9uKHZpZXdwb3J0Qm91
bmRpbmdSZWN0KTsKICAgICAgICAgbm9uT3ZlcmxhcFJlZ2lvbi5zdWJ0cmFjdChuZXdPdmVybGFw
UmVnaW9uKTsKICAgICAgICAgb3ZlcmxhcFJlZ2lvbi51bml0ZShuZXdPdmVybGFwUmVnaW9uKTsK
ICAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIFJlZ2lvbiBuZXdPdmVybGFwUmVnaW9uOwot
ICAgIFJlZ2lvbiBuZXdOb25PdmVybGFwUmVnaW9uKGVuY2xvc2luZ0ludFJlY3QoYm91bmRpbmdS
ZWN0KSk7CisgICAgUmVnaW9uIG5ld05vbk92ZXJsYXBSZWdpb24odmlld3BvcnRCb3VuZGluZ1Jl
Y3QpOwogCiAgICAgaWYgKCFtX3N0YXRlLm1hc2tzVG9Cb3VuZHMpIHsKICAgICAgICAgZm9yIChh
dXRvKiBjaGlsZCA6IG1fY2hpbGRyZW4pCkBAIC00MDgsOSArNDEyLDYgQEAgdm9pZCBUZXh0dXJl
TWFwcGVyTGF5ZXI6OnBhaW50VXNpbmdPdmVybGFwUmVnaW9ucyhjb25zdCBUZXh0dXJlTWFwcGVy
UGFpbnRPcHRpb24KICAgICBhdXRvIHJlY3RzID0gbm9uT3ZlcmxhcFJlZ2lvbi5yZWN0cygpOwog
CiAgICAgZm9yIChhdXRvJiByZWN0IDogcmVjdHMpIHsKLSAgICAgICAgaWYgKCFyZWN0LmludGVy
c2VjdHMob3B0aW9ucy50ZXh0dXJlTWFwcGVyLmNsaXBCb3VuZHMoKSkpCi0gICAgICAgICAgICBj
b250aW51ZTsKLQogICAgICAgICBvcHRpb25zLnRleHR1cmVNYXBwZXIuYmVnaW5DbGlwKFRyYW5z
Zm9ybWF0aW9uTWF0cml4KCksIEZsb2F0Um91bmRlZFJlY3QocmVjdCkpOwogICAgICAgICBwYWlu
dFNlbGZBbmRDaGlsZHJlbldpdGhSZXBsaWNhKG9wdGlvbnMpOwogICAgICAgICBvcHRpb25zLnRl
eHR1cmVNYXBwZXIuZW5kQ2xpcCgpOwpAQCAtNDI0LDE1ICs0MjUsMTEgQEAgdm9pZCBUZXh0dXJl
TWFwcGVyTGF5ZXI6OnBhaW50VXNpbmdPdmVybGFwUmVnaW9ucyhjb25zdCBUZXh0dXJlTWFwcGVy
UGFpbnRPcHRpb24KICAgICB9CiAKICAgICBJbnRTaXplIG1heFRleHR1cmVTaXplID0gb3B0aW9u
cy50ZXh0dXJlTWFwcGVyLm1heFRleHR1cmVTaXplKCk7Ci0gICAgSW50UmVjdCBhZGp1c3RlZENs
aXBCb3VuZHMob3B0aW9ucy50ZXh0dXJlTWFwcGVyLmNsaXBCb3VuZHMoKSk7Ci0gICAgYWRqdXN0
ZWRDbGlwQm91bmRzLm1vdmUoLW9wdGlvbnMub2Zmc2V0KTsKICAgICBmb3IgKGF1dG8mIHJlY3Qg
OiByZWN0cykgewogICAgICAgICBmb3IgKGludCB4ID0gcmVjdC54KCk7IHggPCByZWN0Lm1heFgo
KTsgeCArPSBtYXhUZXh0dXJlU2l6ZS53aWR0aCgpKSB7CiAgICAgICAgICAgICBmb3IgKGludCB5
ID0gcmVjdC55KCk7IHkgPCByZWN0Lm1heFkoKTsgeSArPSBtYXhUZXh0dXJlU2l6ZS5oZWlnaHQo
KSkgewogICAgICAgICAgICAgICAgIEludFJlY3QgdGlsZVJlY3QoSW50UG9pbnQoeCwgeSksIG1h
eFRleHR1cmVTaXplKTsKICAgICAgICAgICAgICAgICB0aWxlUmVjdC5pbnRlcnNlY3QocmVjdCk7
Ci0gICAgICAgICAgICAgICAgaWYgKCF0aWxlUmVjdC5pbnRlcnNlY3RzKGFkanVzdGVkQ2xpcEJv
dW5kcykpCi0gICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogCiAgICAgICAgICAgICAgICAg
cGFpbnRXaXRoSW50ZXJtZWRpYXRlU3VyZmFjZShvcHRpb25zLCB0aWxlUmVjdCk7CiAgICAgICAg
ICAgICB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9D
aGFuZ2VMb2cKaW5kZXggNjQ4ZjU4YjJmNjljNTRkODBlMmJiMWQ5MWVmYmJmMTA3NWRmYjhiMi4u
YWI3MThmMzc0Nzg4ZmE2MTM5OWVlMGY5NjdjOWFkZGI2MWY3ZGVhMyAxMDA2NDQKLS0tIGEvTGF5
b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsx
LDE0IEBACisyMDIwLTEwLTMwICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnku
Y29tPgorCisgICAgICAgIFtUZXh0dXJlTWFwcGVyXSBDcmFzaGVkIGluIFRleHR1cmVNYXBwZXJM
YXllcjo6cGFpbnRVc2luZ092ZXJsYXBSZWdpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQ4MTcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY2
NDg5MDkwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg
ICogY29tcG9zaXRpbmcvdGlsaW5nL2h1Z2UtbGF5ZXItd2l0aC1vcGFjaXR5LWV4cGVjdGVkLmh0
bWw6IEFkZGVkLgorICAgICAgICAqIGNvbXBvc2l0aW5nL3RpbGluZy9odWdlLWxheWVyLXdpdGgt
b3BhY2l0eS5odG1sOiBBZGRlZC4KKwogMjAyMC0xMC0zMCAgRnVqaWkgSGlyb25vcmkgIDxIaXJv
bm9yaS5GdWppaUBzb255LmNvbT4KIAogICAgICAgICBbVGV4dHVyZU1hcHBlcl0gUmVwbGljYSBs
YXllcnMgZG9uJ3QgYmxlbmQgY29ycmVjdGx5IGJlY2F1c2UgY29tcHV0ZU92ZXJsYXBSZWdpb25z
IGRvZXNuJ3QgdGFrZSBUZXh0dXJlTWFwcGVyUGFpbnRPcHRpb25zOjp0cmFuc2Zvcm0gaW50byBh
Y2NvdW50CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy90aWxpbmcvaHVnZS1s
YXllci13aXRoLW9wYWNpdHktZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5n
L3RpbGluZy9odWdlLWxheWVyLXdpdGgtb3BhY2l0eS1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1v
ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu
LmZlMjlhMjBhNjk1YzE3OWNjYjVmYzNkMDNiOGU3NDBkOTMxODhjMmYKLS0tIC9kZXYvbnVsbAor
KysgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy90aWxpbmcvaHVnZS1sYXllci13aXRoLW9wYWNp
dHktZXhwZWN0ZWQuaHRtbApAQCAtMCwwICsxLDIyIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1s
PgorICAgIDxoZWFkPgorICAgICAgICA8bWV0YSBjaGFyc2V0PSJ1dGYtOCI+CisgICAgICAgIDxz
dHlsZT4KKyAgICAgICAgICAgIGRpdiB7CisgICAgICAgICAgICAgICAgd2lkdGg6IDEwMDAwMHB4
OworICAgICAgICAgICAgICAgIGhlaWdodDogMTAwMDAwcHg7CisgICAgICAgICAgICAgICAgYmFj
a2dyb3VuZDogZ3JlZW47CisgICAgICAgICAgICAgICAgYm9yZGVyOiAxMHB4IHNvbGlkIGJsdWU7
CisgICAgICAgICAgICB9CisgICAgICAgIDwvc3R5bGU+CisgICAgPC9oZWFkPgorICAgIDxib2R5
PgorICAgICAgICBSZW5kZXJpbmcgYSBodWdlIG9wYWNpdHkgbGF5ZXIgc2hvdWxkbid0IGNyYXNo
IDxhIGhyZWY9Imh0dHBzOi8vd2Via2l0Lm9yZy9iLzIxNDgxNyI+QnVnIDIxNDgxNzwvYT4uCisg
ICAgICAgIDxkaXY+CisgICAgICAgICAgICA8ZGl2PgorICAgICAgICAgICAgICAgIDxkaXY+PC9k
aXY+CisgICAgICAgICAgICA8L2Rpdj4KKyAgICAgICAgPC9kaXY+CisgICAgPC9ib2R5PgorPC9o
dG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvdGlsaW5nL2h1Z2UtbGF5
ZXItd2l0aC1vcGFjaXR5Lmh0bWwgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy90aWxpbmcvaHVn
ZS1sYXllci13aXRoLW9wYWNpdHkuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wMGJhNDUyODE5ZDNlMzc2ZGZh
Y2U4ZWJlOGU5MTMxNTRmNzBkMzIxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvY29t
cG9zaXRpbmcvdGlsaW5nL2h1Z2UtbGF5ZXItd2l0aC1vcGFjaXR5Lmh0bWwKQEAgLTAsMCArMSwy
NCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKyAgICA8aGVhZD4KKyAgICAgICAgPG1ldGEg
Y2hhcnNldD0idXRmLTgiPgorICAgICAgICA8c3R5bGU+CisgICAgICAgICAgICBkaXYgeworICAg
ICAgICAgICAgICAgIHdpZHRoOiAxMDAwMDBweDsKKyAgICAgICAgICAgICAgICBoZWlnaHQ6IDEw
MDAwMHB4OworICAgICAgICAgICAgICAgIGJhY2tncm91bmQ6IGdyZWVuOworICAgICAgICAgICAg
ICAgIGJvcmRlcjogMTBweCBzb2xpZCBibHVlOworICAgICAgICAgICAgICAgIG9wYWNpdHk6IDAu
NTsKKyAgICAgICAgICAgICAgICB3aWxsLWNoYW5nZTogdHJhbnNmb3JtOworICAgICAgICAgICAg
fQorICAgICAgICA8L3N0eWxlPgorICAgIDwvaGVhZD4KKyAgICA8Ym9keT4KKyAgICAgICAgUmVu
ZGVyaW5nIGEgaHVnZSBvcGFjaXR5IGxheWVyIHNob3VsZG4ndCBjcmFzaCA8YSBocmVmPSJodHRw
czovL3dlYmtpdC5vcmcvYi8yMTQ4MTciPkJ1ZyAyMTQ4MTc8L2E+LgorICAgICAgICA8ZGl2Pgor
ICAgICAgICAgICAgPGRpdj4KKyAgICAgICAgICAgICAgICA8ZGl2PjwvZGl2PgorICAgICAgICAg
ICAgPC9kaXY+CisgICAgICAgIDwvZGl2PgorICAgIDwvYm9keT4KKzwvaHRtbD4K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>412853</attachid>
            <date>2020-10-31 13:14:14 -0700</date>
            <delta_ts>2020-10-31 13:16:08 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-214817-20201101051413.patch</filename>
            <type>text/plain</type>
            <size>8325</size>
            <attacher name="Fujii Hironori">fujii</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5MjI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTUzNWE3YzAzYmQxNWFj
MjViNzUzMTgzY2I5MjZkMjQwYTU2ZjQ5Mi4uZGEzN2MzYjJjMmE5YWJlMWEwNmYyYjU4ZTRjZGIx
NWY1NmFjZmFiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIwLTEwLTMxICBGdWpp
aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFtUZXh0dXJl
TWFwcGVyXSBDcmFzaGVkIGluIFRleHR1cmVNYXBwZXJMYXllcjo6cGFpbnRVc2luZ092ZXJsYXBS
ZWdpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y
MTQ4MTcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY2NDg5MDkwPgorCisgICAgICAgIFJldmll
d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRleHR1cmVNYXBwZXJMYXllcjo6cGFp
bnRVc2luZ092ZXJsYXBSZWdpb25zIGhhcyB0aGUgZXhwcmVzc2lvbgorICAgICAgICBgb3Zlcmxh
cFJlZ2lvbi5ib3VuZHMoKS5zaXplKCkuYXJlYSgpYCB3aGljaCBjcmFzaGVzIGZvciBhIHZlcnkK
KyAgICAgICAgbGFyZ2UgbGF5ZXIuCisKKyAgICAgICAgY29tcHV0ZU92ZXJsYXBSZWdpb25zIHJl
dHVybmVkIHZlcnkgbGFyZ2Ugb3ZlcmxhcCBhbmQgbm9uLW92ZXJsYXAKKyAgICAgICAgcmVnaW9u
cyB3aXRob3V0IHRha2luZyB0aGUgY2xpcCBib3VuZHMgaW50byBhY2NvdW50LgorCisgICAgICAg
IENoYW5nZSBjb21wdXRlT3ZlcmxhcFJlZ2lvbnMgdG8gcmV0dXJuIGNsaXBwZWQgcmVnaW9ucy4K
KyAgICAgICAgcGFpbnRVc2luZ092ZXJsYXBSZWdpb25zIG5vIGxvbmdlciBuZWVkcyB0byBjbGlw
IHRoZSByZXR1cm5lZAorICAgICAgICByZWdpb25zLgorCisgICAgICAgIFRlc3Q6IGNvbXBvc2l0
aW5nL3RpbGluZy9odWdlLWxheWVyLXdpdGgtb3BhY2l0eS5odG1sCisKKyAgICAgICAgKiBwbGF0
Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmNwcDoKKyAgICAgICAgKFdl
YkNvcmU6OlRleHR1cmVNYXBwZXJMYXllcjo6Y29tcHV0ZU92ZXJsYXBSZWdpb25zKToKKyAgICAg
ICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJMYXllcjo6cGFpbnRVc2luZ092ZXJsYXBSZWdpb25z
KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVy
Lmg6CisKIDIwMjAtMTAtMzEgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+
CiAKICAgICAgICAgQ2xlYW4gdXAgQm94U2lkZSBhbmQgQm9yZGVyRWRnZSBjb2RlCmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBl
ckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0
dXJlTWFwcGVyTGF5ZXIuY3BwCmluZGV4IDVlMDhiNTZlZGQ2ODBhMTRhYTY4NDgyM2Y5NDQyYTYy
MDY3NGM3ZmUuLjgwYjBmYzg5M2NiOGQzNWNhMGRkY2IxODZmOTk5ZmZjZTBjMzViYjcgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFw
cGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1h
cC9UZXh0dXJlTWFwcGVyTGF5ZXIuY3BwCkBAIC0zMzAsMTggKzMzMCwxOCBAQCB2b2lkIFRleHR1
cmVNYXBwZXJMYXllcjo6Y29tcHV0ZU92ZXJsYXBSZWdpb25zKGNvbnN0IFRleHR1cmVNYXBwZXJQ
YWludE9wdGlvbnMmCiAgICAgaWYgKCFtX3N0YXRlLnZpc2libGUgfHwgIW1fc3RhdGUuY29udGVu
dHNWaXNpYmxlKQogICAgICAgICByZXR1cm47CiAKLSAgICBGbG9hdFJlY3QgYm91bmRpbmdSZWN0
OworICAgIEZsb2F0UmVjdCBsb2NhbEJvdW5kaW5nUmVjdDsKICAgICBpZiAobV9iYWNraW5nU3Rv
cmUgfHwgbV9zdGF0ZS5tYXNrc1RvQm91bmRzIHx8IG1fc3RhdGUubWFza0xheWVyIHx8IGhhc0Zp
bHRlcnMoKSkKLSAgICAgICAgYm91bmRpbmdSZWN0ID0gbGF5ZXJSZWN0KCk7CisgICAgICAgIGxv
Y2FsQm91bmRpbmdSZWN0ID0gbGF5ZXJSZWN0KCk7CiAgICAgZWxzZSBpZiAobV9jb250ZW50c0xh
eWVyIHx8IG1fc3RhdGUuc29saWRDb2xvci5pc1Zpc2libGUoKSkKLSAgICAgICAgYm91bmRpbmdS
ZWN0ID0gbV9zdGF0ZS5jb250ZW50c1JlY3Q7CisgICAgICAgIGxvY2FsQm91bmRpbmdSZWN0ID0g
bV9zdGF0ZS5jb250ZW50c1JlY3Q7CiAKICAgICBpZiAobV9jdXJyZW50RmlsdGVycy5oYXNPdXRz
ZXRzKCkpIHsKICAgICAgICAgYXV0byBvdXRzZXRzID0gbV9jdXJyZW50RmlsdGVycy5vdXRzZXRz
KCk7Ci0gICAgICAgIEludFJlY3QgdW5maWx0ZXJlZFRhcmdldFJlY3QoYm91bmRpbmdSZWN0KTsK
LSAgICAgICAgYm91bmRpbmdSZWN0Lm1vdmUoc3RkOjptYXgoMCwgLW91dHNldHMubGVmdCgpKSwg
c3RkOjptYXgoMCwgLW91dHNldHMudG9wKCkpKTsKLSAgICAgICAgYm91bmRpbmdSZWN0LmV4cGFu
ZChvdXRzZXRzLmxlZnQoKSArIG91dHNldHMucmlnaHQoKSwgb3V0c2V0cy50b3AoKSArIG91dHNl
dHMuYm90dG9tKCkpOwotICAgICAgICBib3VuZGluZ1JlY3QudW5pdGUodW5maWx0ZXJlZFRhcmdl
dFJlY3QpOworICAgICAgICBJbnRSZWN0IHVuZmlsdGVyZWRUYXJnZXRSZWN0KGxvY2FsQm91bmRp
bmdSZWN0KTsKKyAgICAgICAgbG9jYWxCb3VuZGluZ1JlY3QubW92ZShzdGQ6Om1heCgwLCAtb3V0
c2V0cy5sZWZ0KCkpLCBzdGQ6Om1heCgwLCAtb3V0c2V0cy50b3AoKSkpOworICAgICAgICBsb2Nh
bEJvdW5kaW5nUmVjdC5leHBhbmQob3V0c2V0cy5sZWZ0KCkgKyBvdXRzZXRzLnJpZ2h0KCksIG91
dHNldHMudG9wKCkgKyBvdXRzZXRzLmJvdHRvbSgpKTsKKyAgICAgICAgbG9jYWxCb3VuZGluZ1Jl
Y3QudW5pdGUodW5maWx0ZXJlZFRhcmdldFJlY3QpOwogICAgIH0KIAogICAgIFRyYW5zZm9ybWF0
aW9uTWF0cml4IHRyYW5zZm9ybTsKQEAgLTM1MSwyMSArMzUxLDI1IEBAIHZvaWQgVGV4dHVyZU1h
cHBlckxheWVyOjpjb21wdXRlT3ZlcmxhcFJlZ2lvbnMoY29uc3QgVGV4dHVyZU1hcHBlclBhaW50
T3B0aW9ucyYKICAgICBUcmFuc2Zvcm1hdGlvbk1hdHJpeCByZXBsaWNhTWF0cml4OwogICAgIGlm
IChtX3N0YXRlLnJlcGxpY2FMYXllcikgewogICAgICAgICByZXBsaWNhTWF0cml4ID0gcmVwbGlj
YVRyYW5zZm9ybSgpOwotICAgICAgICBib3VuZGluZ1JlY3QudW5pdGUocmVwbGljYU1hdHJpeC5t
YXBSZWN0KGJvdW5kaW5nUmVjdCkpOworICAgICAgICBsb2NhbEJvdW5kaW5nUmVjdC51bml0ZShy
ZXBsaWNhTWF0cml4Lm1hcFJlY3QobG9jYWxCb3VuZGluZ1JlY3QpKTsKICAgICB9CiAKLSAgICBi
b3VuZGluZ1JlY3QgPSB0cmFuc2Zvcm0ubWFwUmVjdChib3VuZGluZ1JlY3QpOworICAgIEludFJl
Y3QgY2xpcEJvdW5kcyhvcHRpb25zLnRleHR1cmVNYXBwZXIuY2xpcEJvdW5kcygpKTsKKyAgICBj
bGlwQm91bmRzLm1vdmUoLW9wdGlvbnMub2Zmc2V0KTsKKworICAgIEludFJlY3Qgdmlld3BvcnRC
b3VuZGluZ1JlY3QgPSBlbmNsb3NpbmdJbnRSZWN0KHRyYW5zZm9ybS5tYXBSZWN0KGxvY2FsQm91
bmRpbmdSZWN0KSk7CisgICAgdmlld3BvcnRCb3VuZGluZ1JlY3QuaW50ZXJzZWN0KGNsaXBCb3Vu
ZHMpOwogCiAgICAgLy8gQ291bnQgYWxsIG1hc2tzIGFuZCBmaWx0ZXJzIGFzIG92ZXJsYXAgbGF5
ZXJzLgogICAgIGlmIChoYXNGaWx0ZXJzKCkgfHwgbV9zdGF0ZS5tYXNrTGF5ZXIgfHwgKG1fc3Rh
dGUucmVwbGljYUxheWVyICYmIG1fc3RhdGUucmVwbGljYUxheWVyLT5tX3N0YXRlLm1hc2tMYXll
cikpIHsKLSAgICAgICAgUmVnaW9uIG5ld092ZXJsYXBSZWdpb24oZW5jbG9zaW5nSW50UmVjdChi
b3VuZGluZ1JlY3QpKTsKKyAgICAgICAgUmVnaW9uIG5ld092ZXJsYXBSZWdpb24odmlld3BvcnRC
b3VuZGluZ1JlY3QpOwogICAgICAgICBub25PdmVybGFwUmVnaW9uLnN1YnRyYWN0KG5ld092ZXJs
YXBSZWdpb24pOwogICAgICAgICBvdmVybGFwUmVnaW9uLnVuaXRlKG5ld092ZXJsYXBSZWdpb24p
OwogICAgICAgICByZXR1cm47CiAgICAgfQogCiAgICAgUmVnaW9uIG5ld092ZXJsYXBSZWdpb247
Ci0gICAgUmVnaW9uIG5ld05vbk92ZXJsYXBSZWdpb24oZW5jbG9zaW5nSW50UmVjdChib3VuZGlu
Z1JlY3QpKTsKKyAgICBSZWdpb24gbmV3Tm9uT3ZlcmxhcFJlZ2lvbih2aWV3cG9ydEJvdW5kaW5n
UmVjdCk7CiAKICAgICBpZiAoIW1fc3RhdGUubWFza3NUb0JvdW5kcykgewogICAgICAgICBmb3Ig
KGF1dG8qIGNoaWxkIDogbV9jaGlsZHJlbikKQEAgLTQwOCw5ICs0MTIsNiBAQCB2b2lkIFRleHR1
cmVNYXBwZXJMYXllcjo6cGFpbnRVc2luZ092ZXJsYXBSZWdpb25zKGNvbnN0IFRleHR1cmVNYXBw
ZXJQYWludE9wdGlvbgogICAgIGF1dG8gcmVjdHMgPSBub25PdmVybGFwUmVnaW9uLnJlY3RzKCk7
CiAKICAgICBmb3IgKGF1dG8mIHJlY3QgOiByZWN0cykgewotICAgICAgICBpZiAoIXJlY3QuaW50
ZXJzZWN0cyhvcHRpb25zLnRleHR1cmVNYXBwZXIuY2xpcEJvdW5kcygpKSkKLSAgICAgICAgICAg
IGNvbnRpbnVlOwotCiAgICAgICAgIG9wdGlvbnMudGV4dHVyZU1hcHBlci5iZWdpbkNsaXAoVHJh
bnNmb3JtYXRpb25NYXRyaXgoKSwgRmxvYXRSb3VuZGVkUmVjdChyZWN0KSk7CiAgICAgICAgIHBh
aW50U2VsZkFuZENoaWxkcmVuV2l0aFJlcGxpY2Eob3B0aW9ucyk7CiAgICAgICAgIG9wdGlvbnMu
dGV4dHVyZU1hcHBlci5lbmRDbGlwKCk7CkBAIC00MjQsMTUgKzQyNSwxMSBAQCB2b2lkIFRleHR1
cmVNYXBwZXJMYXllcjo6cGFpbnRVc2luZ092ZXJsYXBSZWdpb25zKGNvbnN0IFRleHR1cmVNYXBw
ZXJQYWludE9wdGlvbgogICAgIH0KIAogICAgIEludFNpemUgbWF4VGV4dHVyZVNpemUgPSBvcHRp
b25zLnRleHR1cmVNYXBwZXIubWF4VGV4dHVyZVNpemUoKTsKLSAgICBJbnRSZWN0IGFkanVzdGVk
Q2xpcEJvdW5kcyhvcHRpb25zLnRleHR1cmVNYXBwZXIuY2xpcEJvdW5kcygpKTsKLSAgICBhZGp1
c3RlZENsaXBCb3VuZHMubW92ZSgtb3B0aW9ucy5vZmZzZXQpOwogICAgIGZvciAoYXV0byYgcmVj
dCA6IHJlY3RzKSB7CiAgICAgICAgIGZvciAoaW50IHggPSByZWN0LngoKTsgeCA8IHJlY3QubWF4
WCgpOyB4ICs9IG1heFRleHR1cmVTaXplLndpZHRoKCkpIHsKICAgICAgICAgICAgIGZvciAoaW50
IHkgPSByZWN0LnkoKTsgeSA8IHJlY3QubWF4WSgpOyB5ICs9IG1heFRleHR1cmVTaXplLmhlaWdo
dCgpKSB7CiAgICAgICAgICAgICAgICAgSW50UmVjdCB0aWxlUmVjdChJbnRQb2ludCh4LCB5KSwg
bWF4VGV4dHVyZVNpemUpOwogICAgICAgICAgICAgICAgIHRpbGVSZWN0LmludGVyc2VjdChyZWN0
KTsKLSAgICAgICAgICAgICAgICBpZiAoIXRpbGVSZWN0LmludGVyc2VjdHMoYWRqdXN0ZWRDbGlw
Qm91bmRzKSkKLSAgICAgICAgICAgICAgICAgICAgY29udGludWU7CiAKICAgICAgICAgICAgICAg
ICBwYWludFdpdGhJbnRlcm1lZGlhdGVTdXJmYWNlKG9wdGlvbnMsIHRpbGVSZWN0KTsKICAgICAg
ICAgICAgIH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3Rz
L0NoYW5nZUxvZwppbmRleCAxNDdjMGY5M2Y3ZjNkZjI1YWI5YmJkNDcxMjE4MDAxOTY2MTk5YmYz
Li42NGM0Zjg1NDc4MzdkN2Y1NTg0MTg3NGFmODlhMzg3MjBhNzA0Mjc3IDEwMDY0NAotLS0gYS9M
YXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMg
KzEsMTQgQEAKKzIwMjAtMTAtMzEgIEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29u
eS5jb20+CisKKyAgICAgICAgW1RleHR1cmVNYXBwZXJdIENyYXNoZWQgaW4gVGV4dHVyZU1hcHBl
ckxheWVyOjpwYWludFVzaW5nT3ZlcmxhcFJlZ2lvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNDgxNworICAgICAgICA8cmRhcjovL3Byb2JsZW0v
NjY0ODkwOTA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg
ICAgKiBjb21wb3NpdGluZy90aWxpbmcvaHVnZS1sYXllci13aXRoLW9wYWNpdHktZXhwZWN0ZWQu
aHRtbDogQWRkZWQuCisgICAgICAgICogY29tcG9zaXRpbmcvdGlsaW5nL2h1Z2UtbGF5ZXItd2l0
aC1vcGFjaXR5Lmh0bWw6IEFkZGVkLgorCiAyMDIwLTEwLTMxICBDaHJpcyBEdW1leiAgPGNkdW1l
ekBhcHBsZS5jb20+CiAKICAgICAgICAgUHJvbWlzZXMgcmV0dXJuZWQgYnkgb3VyIERPTSBBUEkg
aGF2ZSB0aGUgY2FsbGVyJ3MgZ2xvYmFsIGluc3RlYWQgb2YgdGhlIGNhbGxlZSdzCmRpZmYgLS1n
aXQgYS9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy90aWxpbmcvaHVnZS1sYXllci13aXRoLW9wYWNp
dHktZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL3RpbGluZy9odWdlLWxh
eWVyLXdpdGgtb3BhY2l0eS1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4
IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjE4MjZkYWVlNGI1OTli
NzRhODA1MGFhMGNhYWJhZjg0MzViMTY0NTYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0
cy9jb21wb3NpdGluZy90aWxpbmcvaHVnZS1sYXllci13aXRoLW9wYWNpdHktZXhwZWN0ZWQuaHRt
bApAQCAtMCwwICsxLDIzIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorICAgIDxoZWFkPgor
ICAgICAgICA8bWV0YSBjaGFyc2V0PSJ1dGYtOCI+CisgICAgICAgIDxzdHlsZT4KKyAgICAgICAg
ICAgIGRpdiB7CisgICAgICAgICAgICAgICAgd2lkdGg6IDEwMDBweDsKKyAgICAgICAgICAgICAg
ICBoZWlnaHQ6IDEwMDBweDsKKyAgICAgICAgICAgICAgICBiYWNrZ3JvdW5kOiBncmVlbjsKKyAg
ICAgICAgICAgICAgICBvcGFjaXR5OiAwLjU7CisgICAgICAgICAgICAgICAgYm9yZGVyOiAxMHB4
IHNvbGlkIGJsdWU7CisgICAgICAgICAgICB9CisgICAgICAgIDwvc3R5bGU+CisgICAgPC9oZWFk
PgorICAgIDxib2R5PgorICAgICAgICBSZW5kZXJpbmcgYSBodWdlIG9wYWNpdHkgbGF5ZXIgc2hv
dWxkbid0IGNyYXNoIDxhIGhyZWY9Imh0dHBzOi8vd2Via2l0Lm9yZy9iLzIxNDgxNyI+QnVnIDIx
NDgxNzwvYT4uCisgICAgICAgIDxkaXY+CisgICAgICAgICAgICA8ZGl2PgorICAgICAgICAgICAg
ICAgIDxkaXY+PC9kaXY+CisgICAgICAgICAgICA8L2Rpdj4KKyAgICAgICAgPC9kaXY+CisgICAg
PC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvdGls
aW5nL2h1Z2UtbGF5ZXItd2l0aC1vcGFjaXR5Lmh0bWwgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGlu
Zy90aWxpbmcvaHVnZS1sYXllci13aXRoLW9wYWNpdHkuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0
NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wMGJhNDUy
ODE5ZDNlMzc2ZGZhY2U4ZWJlOGU5MTMxNTRmNzBkMzIxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5
b3V0VGVzdHMvY29tcG9zaXRpbmcvdGlsaW5nL2h1Z2UtbGF5ZXItd2l0aC1vcGFjaXR5Lmh0bWwK
QEAgLTAsMCArMSwyNCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKyAgICA8aGVhZD4KKyAg
ICAgICAgPG1ldGEgY2hhcnNldD0idXRmLTgiPgorICAgICAgICA8c3R5bGU+CisgICAgICAgICAg
ICBkaXYgeworICAgICAgICAgICAgICAgIHdpZHRoOiAxMDAwMDBweDsKKyAgICAgICAgICAgICAg
ICBoZWlnaHQ6IDEwMDAwMHB4OworICAgICAgICAgICAgICAgIGJhY2tncm91bmQ6IGdyZWVuOwor
ICAgICAgICAgICAgICAgIGJvcmRlcjogMTBweCBzb2xpZCBibHVlOworICAgICAgICAgICAgICAg
IG9wYWNpdHk6IDAuNTsKKyAgICAgICAgICAgICAgICB3aWxsLWNoYW5nZTogdHJhbnNmb3JtOwor
ICAgICAgICAgICAgfQorICAgICAgICA8L3N0eWxlPgorICAgIDwvaGVhZD4KKyAgICA8Ym9keT4K
KyAgICAgICAgUmVuZGVyaW5nIGEgaHVnZSBvcGFjaXR5IGxheWVyIHNob3VsZG4ndCBjcmFzaCA8
YSBocmVmPSJodHRwczovL3dlYmtpdC5vcmcvYi8yMTQ4MTciPkJ1ZyAyMTQ4MTc8L2E+LgorICAg
ICAgICA8ZGl2PgorICAgICAgICAgICAgPGRpdj4KKyAgICAgICAgICAgICAgICA8ZGl2PjwvZGl2
PgorICAgICAgICAgICAgPC9kaXY+CisgICAgICAgIDwvZGl2PgorICAgIDwvYm9keT4KKzwvaHRt
bD4K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>412854</attachid>
            <date>2020-10-31 13:16:11 -0700</date>
            <delta_ts>2020-11-01 12:30:16 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-214817-20201101051610.patch</filename>
            <type>text/plain</type>
            <size>8366</size>
            <attacher name="Fujii Hironori">fujii</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5MjI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTUzNWE3YzAzYmQxNWFj
MjViNzUzMTgzY2I5MjZkMjQwYTU2ZjQ5Mi4uZGEzN2MzYjJjMmE5YWJlMWEwNmYyYjU4ZTRjZGIx
NWY1NmFjZmFiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIwLTEwLTMxICBGdWpp
aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFtUZXh0dXJl
TWFwcGVyXSBDcmFzaGVkIGluIFRleHR1cmVNYXBwZXJMYXllcjo6cGFpbnRVc2luZ092ZXJsYXBS
ZWdpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y
MTQ4MTcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY2NDg5MDkwPgorCisgICAgICAgIFJldmll
d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRleHR1cmVNYXBwZXJMYXllcjo6cGFp
bnRVc2luZ092ZXJsYXBSZWdpb25zIGhhcyB0aGUgZXhwcmVzc2lvbgorICAgICAgICBgb3Zlcmxh
cFJlZ2lvbi5ib3VuZHMoKS5zaXplKCkuYXJlYSgpYCB3aGljaCBjcmFzaGVzIGZvciBhIHZlcnkK
KyAgICAgICAgbGFyZ2UgbGF5ZXIuCisKKyAgICAgICAgY29tcHV0ZU92ZXJsYXBSZWdpb25zIHJl
dHVybmVkIHZlcnkgbGFyZ2Ugb3ZlcmxhcCBhbmQgbm9uLW92ZXJsYXAKKyAgICAgICAgcmVnaW9u
cyB3aXRob3V0IHRha2luZyB0aGUgY2xpcCBib3VuZHMgaW50byBhY2NvdW50LgorCisgICAgICAg
IENoYW5nZSBjb21wdXRlT3ZlcmxhcFJlZ2lvbnMgdG8gcmV0dXJuIGNsaXBwZWQgcmVnaW9ucy4K
KyAgICAgICAgcGFpbnRVc2luZ092ZXJsYXBSZWdpb25zIG5vIGxvbmdlciBuZWVkcyB0byBjbGlw
IHRoZSByZXR1cm5lZAorICAgICAgICByZWdpb25zLgorCisgICAgICAgIFRlc3Q6IGNvbXBvc2l0
aW5nL3RpbGluZy9odWdlLWxheWVyLXdpdGgtb3BhY2l0eS5odG1sCisKKyAgICAgICAgKiBwbGF0
Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmNwcDoKKyAgICAgICAgKFdl
YkNvcmU6OlRleHR1cmVNYXBwZXJMYXllcjo6Y29tcHV0ZU92ZXJsYXBSZWdpb25zKToKKyAgICAg
ICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJMYXllcjo6cGFpbnRVc2luZ092ZXJsYXBSZWdpb25z
KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVy
Lmg6CisKIDIwMjAtMTAtMzEgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+
CiAKICAgICAgICAgQ2xlYW4gdXAgQm94U2lkZSBhbmQgQm9yZGVyRWRnZSBjb2RlCmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBl
ckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0
dXJlTWFwcGVyTGF5ZXIuY3BwCmluZGV4IDVlMDhiNTZlZGQ2ODBhMTRhYTY4NDgyM2Y5NDQyYTYy
MDY3NGM3ZmUuLjgwYjBmYzg5M2NiOGQzNWNhMGRkY2IxODZmOTk5ZmZjZTBjMzViYjcgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFw
cGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1h
cC9UZXh0dXJlTWFwcGVyTGF5ZXIuY3BwCkBAIC0zMzAsMTggKzMzMCwxOCBAQCB2b2lkIFRleHR1
cmVNYXBwZXJMYXllcjo6Y29tcHV0ZU92ZXJsYXBSZWdpb25zKGNvbnN0IFRleHR1cmVNYXBwZXJQ
YWludE9wdGlvbnMmCiAgICAgaWYgKCFtX3N0YXRlLnZpc2libGUgfHwgIW1fc3RhdGUuY29udGVu
dHNWaXNpYmxlKQogICAgICAgICByZXR1cm47CiAKLSAgICBGbG9hdFJlY3QgYm91bmRpbmdSZWN0
OworICAgIEZsb2F0UmVjdCBsb2NhbEJvdW5kaW5nUmVjdDsKICAgICBpZiAobV9iYWNraW5nU3Rv
cmUgfHwgbV9zdGF0ZS5tYXNrc1RvQm91bmRzIHx8IG1fc3RhdGUubWFza0xheWVyIHx8IGhhc0Zp
bHRlcnMoKSkKLSAgICAgICAgYm91bmRpbmdSZWN0ID0gbGF5ZXJSZWN0KCk7CisgICAgICAgIGxv
Y2FsQm91bmRpbmdSZWN0ID0gbGF5ZXJSZWN0KCk7CiAgICAgZWxzZSBpZiAobV9jb250ZW50c0xh
eWVyIHx8IG1fc3RhdGUuc29saWRDb2xvci5pc1Zpc2libGUoKSkKLSAgICAgICAgYm91bmRpbmdS
ZWN0ID0gbV9zdGF0ZS5jb250ZW50c1JlY3Q7CisgICAgICAgIGxvY2FsQm91bmRpbmdSZWN0ID0g
bV9zdGF0ZS5jb250ZW50c1JlY3Q7CiAKICAgICBpZiAobV9jdXJyZW50RmlsdGVycy5oYXNPdXRz
ZXRzKCkpIHsKICAgICAgICAgYXV0byBvdXRzZXRzID0gbV9jdXJyZW50RmlsdGVycy5vdXRzZXRz
KCk7Ci0gICAgICAgIEludFJlY3QgdW5maWx0ZXJlZFRhcmdldFJlY3QoYm91bmRpbmdSZWN0KTsK
LSAgICAgICAgYm91bmRpbmdSZWN0Lm1vdmUoc3RkOjptYXgoMCwgLW91dHNldHMubGVmdCgpKSwg
c3RkOjptYXgoMCwgLW91dHNldHMudG9wKCkpKTsKLSAgICAgICAgYm91bmRpbmdSZWN0LmV4cGFu
ZChvdXRzZXRzLmxlZnQoKSArIG91dHNldHMucmlnaHQoKSwgb3V0c2V0cy50b3AoKSArIG91dHNl
dHMuYm90dG9tKCkpOwotICAgICAgICBib3VuZGluZ1JlY3QudW5pdGUodW5maWx0ZXJlZFRhcmdl
dFJlY3QpOworICAgICAgICBJbnRSZWN0IHVuZmlsdGVyZWRUYXJnZXRSZWN0KGxvY2FsQm91bmRp
bmdSZWN0KTsKKyAgICAgICAgbG9jYWxCb3VuZGluZ1JlY3QubW92ZShzdGQ6Om1heCgwLCAtb3V0
c2V0cy5sZWZ0KCkpLCBzdGQ6Om1heCgwLCAtb3V0c2V0cy50b3AoKSkpOworICAgICAgICBsb2Nh
bEJvdW5kaW5nUmVjdC5leHBhbmQob3V0c2V0cy5sZWZ0KCkgKyBvdXRzZXRzLnJpZ2h0KCksIG91
dHNldHMudG9wKCkgKyBvdXRzZXRzLmJvdHRvbSgpKTsKKyAgICAgICAgbG9jYWxCb3VuZGluZ1Jl
Y3QudW5pdGUodW5maWx0ZXJlZFRhcmdldFJlY3QpOwogICAgIH0KIAogICAgIFRyYW5zZm9ybWF0
aW9uTWF0cml4IHRyYW5zZm9ybTsKQEAgLTM1MSwyMSArMzUxLDI1IEBAIHZvaWQgVGV4dHVyZU1h
cHBlckxheWVyOjpjb21wdXRlT3ZlcmxhcFJlZ2lvbnMoY29uc3QgVGV4dHVyZU1hcHBlclBhaW50
T3B0aW9ucyYKICAgICBUcmFuc2Zvcm1hdGlvbk1hdHJpeCByZXBsaWNhTWF0cml4OwogICAgIGlm
IChtX3N0YXRlLnJlcGxpY2FMYXllcikgewogICAgICAgICByZXBsaWNhTWF0cml4ID0gcmVwbGlj
YVRyYW5zZm9ybSgpOwotICAgICAgICBib3VuZGluZ1JlY3QudW5pdGUocmVwbGljYU1hdHJpeC5t
YXBSZWN0KGJvdW5kaW5nUmVjdCkpOworICAgICAgICBsb2NhbEJvdW5kaW5nUmVjdC51bml0ZShy
ZXBsaWNhTWF0cml4Lm1hcFJlY3QobG9jYWxCb3VuZGluZ1JlY3QpKTsKICAgICB9CiAKLSAgICBi
b3VuZGluZ1JlY3QgPSB0cmFuc2Zvcm0ubWFwUmVjdChib3VuZGluZ1JlY3QpOworICAgIEludFJl
Y3QgY2xpcEJvdW5kcyhvcHRpb25zLnRleHR1cmVNYXBwZXIuY2xpcEJvdW5kcygpKTsKKyAgICBj
bGlwQm91bmRzLm1vdmUoLW9wdGlvbnMub2Zmc2V0KTsKKworICAgIEludFJlY3Qgdmlld3BvcnRC
b3VuZGluZ1JlY3QgPSBlbmNsb3NpbmdJbnRSZWN0KHRyYW5zZm9ybS5tYXBSZWN0KGxvY2FsQm91
bmRpbmdSZWN0KSk7CisgICAgdmlld3BvcnRCb3VuZGluZ1JlY3QuaW50ZXJzZWN0KGNsaXBCb3Vu
ZHMpOwogCiAgICAgLy8gQ291bnQgYWxsIG1hc2tzIGFuZCBmaWx0ZXJzIGFzIG92ZXJsYXAgbGF5
ZXJzLgogICAgIGlmIChoYXNGaWx0ZXJzKCkgfHwgbV9zdGF0ZS5tYXNrTGF5ZXIgfHwgKG1fc3Rh
dGUucmVwbGljYUxheWVyICYmIG1fc3RhdGUucmVwbGljYUxheWVyLT5tX3N0YXRlLm1hc2tMYXll
cikpIHsKLSAgICAgICAgUmVnaW9uIG5ld092ZXJsYXBSZWdpb24oZW5jbG9zaW5nSW50UmVjdChi
b3VuZGluZ1JlY3QpKTsKKyAgICAgICAgUmVnaW9uIG5ld092ZXJsYXBSZWdpb24odmlld3BvcnRC
b3VuZGluZ1JlY3QpOwogICAgICAgICBub25PdmVybGFwUmVnaW9uLnN1YnRyYWN0KG5ld092ZXJs
YXBSZWdpb24pOwogICAgICAgICBvdmVybGFwUmVnaW9uLnVuaXRlKG5ld092ZXJsYXBSZWdpb24p
OwogICAgICAgICByZXR1cm47CiAgICAgfQogCiAgICAgUmVnaW9uIG5ld092ZXJsYXBSZWdpb247
Ci0gICAgUmVnaW9uIG5ld05vbk92ZXJsYXBSZWdpb24oZW5jbG9zaW5nSW50UmVjdChib3VuZGlu
Z1JlY3QpKTsKKyAgICBSZWdpb24gbmV3Tm9uT3ZlcmxhcFJlZ2lvbih2aWV3cG9ydEJvdW5kaW5n
UmVjdCk7CiAKICAgICBpZiAoIW1fc3RhdGUubWFza3NUb0JvdW5kcykgewogICAgICAgICBmb3Ig
KGF1dG8qIGNoaWxkIDogbV9jaGlsZHJlbikKQEAgLTQwOCw5ICs0MTIsNiBAQCB2b2lkIFRleHR1
cmVNYXBwZXJMYXllcjo6cGFpbnRVc2luZ092ZXJsYXBSZWdpb25zKGNvbnN0IFRleHR1cmVNYXBw
ZXJQYWludE9wdGlvbgogICAgIGF1dG8gcmVjdHMgPSBub25PdmVybGFwUmVnaW9uLnJlY3RzKCk7
CiAKICAgICBmb3IgKGF1dG8mIHJlY3QgOiByZWN0cykgewotICAgICAgICBpZiAoIXJlY3QuaW50
ZXJzZWN0cyhvcHRpb25zLnRleHR1cmVNYXBwZXIuY2xpcEJvdW5kcygpKSkKLSAgICAgICAgICAg
IGNvbnRpbnVlOwotCiAgICAgICAgIG9wdGlvbnMudGV4dHVyZU1hcHBlci5iZWdpbkNsaXAoVHJh
bnNmb3JtYXRpb25NYXRyaXgoKSwgRmxvYXRSb3VuZGVkUmVjdChyZWN0KSk7CiAgICAgICAgIHBh
aW50U2VsZkFuZENoaWxkcmVuV2l0aFJlcGxpY2Eob3B0aW9ucyk7CiAgICAgICAgIG9wdGlvbnMu
dGV4dHVyZU1hcHBlci5lbmRDbGlwKCk7CkBAIC00MjQsMTUgKzQyNSwxMSBAQCB2b2lkIFRleHR1
cmVNYXBwZXJMYXllcjo6cGFpbnRVc2luZ092ZXJsYXBSZWdpb25zKGNvbnN0IFRleHR1cmVNYXBw
ZXJQYWludE9wdGlvbgogICAgIH0KIAogICAgIEludFNpemUgbWF4VGV4dHVyZVNpemUgPSBvcHRp
b25zLnRleHR1cmVNYXBwZXIubWF4VGV4dHVyZVNpemUoKTsKLSAgICBJbnRSZWN0IGFkanVzdGVk
Q2xpcEJvdW5kcyhvcHRpb25zLnRleHR1cmVNYXBwZXIuY2xpcEJvdW5kcygpKTsKLSAgICBhZGp1
c3RlZENsaXBCb3VuZHMubW92ZSgtb3B0aW9ucy5vZmZzZXQpOwogICAgIGZvciAoYXV0byYgcmVj
dCA6IHJlY3RzKSB7CiAgICAgICAgIGZvciAoaW50IHggPSByZWN0LngoKTsgeCA8IHJlY3QubWF4
WCgpOyB4ICs9IG1heFRleHR1cmVTaXplLndpZHRoKCkpIHsKICAgICAgICAgICAgIGZvciAoaW50
IHkgPSByZWN0LnkoKTsgeSA8IHJlY3QubWF4WSgpOyB5ICs9IG1heFRleHR1cmVTaXplLmhlaWdo
dCgpKSB7CiAgICAgICAgICAgICAgICAgSW50UmVjdCB0aWxlUmVjdChJbnRQb2ludCh4LCB5KSwg
bWF4VGV4dHVyZVNpemUpOwogICAgICAgICAgICAgICAgIHRpbGVSZWN0LmludGVyc2VjdChyZWN0
KTsKLSAgICAgICAgICAgICAgICBpZiAoIXRpbGVSZWN0LmludGVyc2VjdHMoYWRqdXN0ZWRDbGlw
Qm91bmRzKSkKLSAgICAgICAgICAgICAgICAgICAgY29udGludWU7CiAKICAgICAgICAgICAgICAg
ICBwYWludFdpdGhJbnRlcm1lZGlhdGVTdXJmYWNlKG9wdGlvbnMsIHRpbGVSZWN0KTsKICAgICAg
ICAgICAgIH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3Rz
L0NoYW5nZUxvZwppbmRleCAxNDdjMGY5M2Y3ZjNkZjI1YWI5YmJkNDcxMjE4MDAxOTY2MTk5YmYz
Li42NGM0Zjg1NDc4MzdkN2Y1NTg0MTg3NGFmODlhMzg3MjBhNzA0Mjc3IDEwMDY0NAotLS0gYS9M
YXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMg
KzEsMTQgQEAKKzIwMjAtMTAtMzEgIEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29u
eS5jb20+CisKKyAgICAgICAgW1RleHR1cmVNYXBwZXJdIENyYXNoZWQgaW4gVGV4dHVyZU1hcHBl
ckxheWVyOjpwYWludFVzaW5nT3ZlcmxhcFJlZ2lvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNDgxNworICAgICAgICA8cmRhcjovL3Byb2JsZW0v
NjY0ODkwOTA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg
ICAgKiBjb21wb3NpdGluZy90aWxpbmcvaHVnZS1sYXllci13aXRoLW9wYWNpdHktZXhwZWN0ZWQu
aHRtbDogQWRkZWQuCisgICAgICAgICogY29tcG9zaXRpbmcvdGlsaW5nL2h1Z2UtbGF5ZXItd2l0
aC1vcGFjaXR5Lmh0bWw6IEFkZGVkLgorCiAyMDIwLTEwLTMxICBDaHJpcyBEdW1leiAgPGNkdW1l
ekBhcHBsZS5jb20+CiAKICAgICAgICAgUHJvbWlzZXMgcmV0dXJuZWQgYnkgb3VyIERPTSBBUEkg
aGF2ZSB0aGUgY2FsbGVyJ3MgZ2xvYmFsIGluc3RlYWQgb2YgdGhlIGNhbGxlZSdzCmRpZmYgLS1n
aXQgYS9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy90aWxpbmcvaHVnZS1sYXllci13aXRoLW9wYWNp
dHktZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL3RpbGluZy9odWdlLWxh
eWVyLXdpdGgtb3BhY2l0eS1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4
IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjcyOThlNWEzZWM0NzE3
NmZjNTQwNGQ1ODQyZTJkZGZiZDQwNmQ4MDQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0
cy9jb21wb3NpdGluZy90aWxpbmcvaHVnZS1sYXllci13aXRoLW9wYWNpdHktZXhwZWN0ZWQuaHRt
bApAQCAtMCwwICsxLDI0IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorICAgIDxoZWFkPgor
ICAgICAgICA8bWV0YSBjaGFyc2V0PSJ1dGYtOCI+CisgICAgICAgIDxzdHlsZT4KKyAgICAgICAg
ICAgIGRpdiB7CisgICAgICAgICAgICAgICAgd2lkdGg6IDEwMDBweDsKKyAgICAgICAgICAgICAg
ICBoZWlnaHQ6IDEwMDBweDsKKyAgICAgICAgICAgICAgICBiYWNrZ3JvdW5kOiBncmVlbjsKKyAg
ICAgICAgICAgICAgICBib3JkZXI6IDEwcHggc29saWQgYmx1ZTsKKyAgICAgICAgICAgICAgICBv
cGFjaXR5OiAwLjU7CisgICAgICAgICAgICAgICAgd2lsbC1jaGFuZ2U6IHRyYW5zZm9ybTsKKyAg
ICAgICAgICAgIH0KKyAgICAgICAgPC9zdHlsZT4KKyAgICA8L2hlYWQ+CisgICAgPGJvZHk+Cisg
ICAgICAgIFJlbmRlcmluZyBhIGh1Z2Ugb3BhY2l0eSBsYXllciBzaG91bGRuJ3QgY3Jhc2ggPGEg
aHJlZj0iaHR0cHM6Ly93ZWJraXQub3JnL2IvMjE0ODE3Ij5CdWcgMjE0ODE3PC9hPi4KKyAgICAg
ICAgPGRpdj4KKyAgICAgICAgICAgIDxkaXY+CisgICAgICAgICAgICAgICAgPGRpdj48L2Rpdj4K
KyAgICAgICAgICAgIDwvZGl2PgorICAgICAgICA8L2Rpdj4KKyAgICA8L2JvZHk+Cis8L2h0bWw+
CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy90aWxpbmcvaHVnZS1sYXllci13
aXRoLW9wYWNpdHkuaHRtbCBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL3RpbGluZy9odWdlLWxh
eWVyLXdpdGgtb3BhY2l0eS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjAwYmE0NTI4MTlkM2UzNzZkZmFjZThl
YmU4ZTkxMzE1NGY3MGQzMjEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jb21wb3Np
dGluZy90aWxpbmcvaHVnZS1sYXllci13aXRoLW9wYWNpdHkuaHRtbApAQCAtMCwwICsxLDI0IEBA
Cis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8bWV0YSBjaGFy
c2V0PSJ1dGYtOCI+CisgICAgICAgIDxzdHlsZT4KKyAgICAgICAgICAgIGRpdiB7CisgICAgICAg
ICAgICAgICAgd2lkdGg6IDEwMDAwMHB4OworICAgICAgICAgICAgICAgIGhlaWdodDogMTAwMDAw
cHg7CisgICAgICAgICAgICAgICAgYmFja2dyb3VuZDogZ3JlZW47CisgICAgICAgICAgICAgICAg
Ym9yZGVyOiAxMHB4IHNvbGlkIGJsdWU7CisgICAgICAgICAgICAgICAgb3BhY2l0eTogMC41Owor
ICAgICAgICAgICAgICAgIHdpbGwtY2hhbmdlOiB0cmFuc2Zvcm07CisgICAgICAgICAgICB9Cisg
ICAgICAgIDwvc3R5bGU+CisgICAgPC9oZWFkPgorICAgIDxib2R5PgorICAgICAgICBSZW5kZXJp
bmcgYSBodWdlIG9wYWNpdHkgbGF5ZXIgc2hvdWxkbid0IGNyYXNoIDxhIGhyZWY9Imh0dHBzOi8v
d2Via2l0Lm9yZy9iLzIxNDgxNyI+QnVnIDIxNDgxNzwvYT4uCisgICAgICAgIDxkaXY+CisgICAg
ICAgICAgICA8ZGl2PgorICAgICAgICAgICAgICAgIDxkaXY+PC9kaXY+CisgICAgICAgICAgICA8
L2Rpdj4KKyAgICAgICAgPC9kaXY+CisgICAgPC9ib2R5PgorPC9odG1sPgo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>412867</attachid>
            <date>2020-11-01 12:30:19 -0800</date>
            <delta_ts>2020-11-03 12:33:02 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-214817-20201102053018.patch</filename>
            <type>text/plain</type>
            <size>8563</size>
            <attacher name="Fujii Hironori">fujii</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5MjM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTljNTM5ZTNhNWE3YjM5
NTEwYzE2ZDBmOGIzYzMxOGZiMWJiNmE2NC4uNWQ1OThlN2QxYzBhY2IwOTA0ODkzMGRmMTZmYTdi
YmQ5YjQyM2ZkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIwLTExLTAxICBGdWpp
aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFtUZXh0dXJl
TWFwcGVyXSBDcmFzaGVkIGluIFRleHR1cmVNYXBwZXJMYXllcjo6cGFpbnRVc2luZ092ZXJsYXBS
ZWdpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y
MTQ4MTcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY2NDg5MDkwPgorCisgICAgICAgIFJldmll
d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRleHR1cmVNYXBwZXJMYXllcjo6cGFp
bnRVc2luZ092ZXJsYXBSZWdpb25zIGhhcyB0aGUgZXhwcmVzc2lvbgorICAgICAgICBgb3Zlcmxh
cFJlZ2lvbi5ib3VuZHMoKS5zaXplKCkuYXJlYSgpYCB3aGljaCBjcmFzaGVzIGZvciBhIHZlcnkK
KyAgICAgICAgbGFyZ2UgbGF5ZXIuCisKKyAgICAgICAgY29tcHV0ZU92ZXJsYXBSZWdpb25zIHJl
dHVybmVkIHZlcnkgbGFyZ2Ugb3ZlcmxhcCBhbmQgbm9uLW92ZXJsYXAKKyAgICAgICAgcmVnaW9u
cyB3aXRob3V0IHRha2luZyB0aGUgY2xpcCBib3VuZHMgaW50byBhY2NvdW50LgorCisgICAgICAg
IENoYW5nZSBjb21wdXRlT3ZlcmxhcFJlZ2lvbnMgdG8gcmV0dXJuIGNsaXBwZWQgcmVnaW9ucy4K
KyAgICAgICAgcGFpbnRVc2luZ092ZXJsYXBSZWdpb25zIG5vIGxvbmdlciBuZWVkcyB0byBjbGlw
IHRoZSByZXR1cm5lZAorICAgICAgICByZWdpb25zLgorCisgICAgICAgIFRlc3Q6IGNvbXBvc2l0
aW5nL3RpbGluZy9odWdlLWxheWVyLXdpdGgtb3BhY2l0eS5odG1sCisKKyAgICAgICAgKiBwbGF0
Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmNwcDoKKyAgICAgICAgKFdl
YkNvcmU6OlRleHR1cmVNYXBwZXJMYXllcjo6Y29tcHV0ZU92ZXJsYXBSZWdpb25zKToKKyAgICAg
ICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJMYXllcjo6cGFpbnRVc2luZ092ZXJsYXBSZWdpb25z
KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVy
Lmg6CisKIDIwMjAtMTEtMDEgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4K
IAogICAgICAgICBBWDogUHJvdmlkZSBidWlsZCB3b3JrYXJvdW5kIHdoaWxlIGlzU3lzdGVtVm9p
Y2UgaXMgbm90IGluIGFsbCBTREtzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y
bS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl
L3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIuY3BwCmluZGV4IDVl
MDhiNTZlZGQ2ODBhMTRhYTY4NDgyM2Y5NDQyYTYyMDY3NGM3ZmUuLjgwYjBmYzg5M2NiOGQzNWNh
MGRkY2IxODZmOTk5ZmZjZTBjMzViYjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm
b3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9X
ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIuY3BwCkBA
IC0zMzAsMTggKzMzMCwxOCBAQCB2b2lkIFRleHR1cmVNYXBwZXJMYXllcjo6Y29tcHV0ZU92ZXJs
YXBSZWdpb25zKGNvbnN0IFRleHR1cmVNYXBwZXJQYWludE9wdGlvbnMmCiAgICAgaWYgKCFtX3N0
YXRlLnZpc2libGUgfHwgIW1fc3RhdGUuY29udGVudHNWaXNpYmxlKQogICAgICAgICByZXR1cm47
CiAKLSAgICBGbG9hdFJlY3QgYm91bmRpbmdSZWN0OworICAgIEZsb2F0UmVjdCBsb2NhbEJvdW5k
aW5nUmVjdDsKICAgICBpZiAobV9iYWNraW5nU3RvcmUgfHwgbV9zdGF0ZS5tYXNrc1RvQm91bmRz
IHx8IG1fc3RhdGUubWFza0xheWVyIHx8IGhhc0ZpbHRlcnMoKSkKLSAgICAgICAgYm91bmRpbmdS
ZWN0ID0gbGF5ZXJSZWN0KCk7CisgICAgICAgIGxvY2FsQm91bmRpbmdSZWN0ID0gbGF5ZXJSZWN0
KCk7CiAgICAgZWxzZSBpZiAobV9jb250ZW50c0xheWVyIHx8IG1fc3RhdGUuc29saWRDb2xvci5p
c1Zpc2libGUoKSkKLSAgICAgICAgYm91bmRpbmdSZWN0ID0gbV9zdGF0ZS5jb250ZW50c1JlY3Q7
CisgICAgICAgIGxvY2FsQm91bmRpbmdSZWN0ID0gbV9zdGF0ZS5jb250ZW50c1JlY3Q7CiAKICAg
ICBpZiAobV9jdXJyZW50RmlsdGVycy5oYXNPdXRzZXRzKCkpIHsKICAgICAgICAgYXV0byBvdXRz
ZXRzID0gbV9jdXJyZW50RmlsdGVycy5vdXRzZXRzKCk7Ci0gICAgICAgIEludFJlY3QgdW5maWx0
ZXJlZFRhcmdldFJlY3QoYm91bmRpbmdSZWN0KTsKLSAgICAgICAgYm91bmRpbmdSZWN0Lm1vdmUo
c3RkOjptYXgoMCwgLW91dHNldHMubGVmdCgpKSwgc3RkOjptYXgoMCwgLW91dHNldHMudG9wKCkp
KTsKLSAgICAgICAgYm91bmRpbmdSZWN0LmV4cGFuZChvdXRzZXRzLmxlZnQoKSArIG91dHNldHMu
cmlnaHQoKSwgb3V0c2V0cy50b3AoKSArIG91dHNldHMuYm90dG9tKCkpOwotICAgICAgICBib3Vu
ZGluZ1JlY3QudW5pdGUodW5maWx0ZXJlZFRhcmdldFJlY3QpOworICAgICAgICBJbnRSZWN0IHVu
ZmlsdGVyZWRUYXJnZXRSZWN0KGxvY2FsQm91bmRpbmdSZWN0KTsKKyAgICAgICAgbG9jYWxCb3Vu
ZGluZ1JlY3QubW92ZShzdGQ6Om1heCgwLCAtb3V0c2V0cy5sZWZ0KCkpLCBzdGQ6Om1heCgwLCAt
b3V0c2V0cy50b3AoKSkpOworICAgICAgICBsb2NhbEJvdW5kaW5nUmVjdC5leHBhbmQob3V0c2V0
cy5sZWZ0KCkgKyBvdXRzZXRzLnJpZ2h0KCksIG91dHNldHMudG9wKCkgKyBvdXRzZXRzLmJvdHRv
bSgpKTsKKyAgICAgICAgbG9jYWxCb3VuZGluZ1JlY3QudW5pdGUodW5maWx0ZXJlZFRhcmdldFJl
Y3QpOwogICAgIH0KIAogICAgIFRyYW5zZm9ybWF0aW9uTWF0cml4IHRyYW5zZm9ybTsKQEAgLTM1
MSwyMSArMzUxLDI1IEBAIHZvaWQgVGV4dHVyZU1hcHBlckxheWVyOjpjb21wdXRlT3ZlcmxhcFJl
Z2lvbnMoY29uc3QgVGV4dHVyZU1hcHBlclBhaW50T3B0aW9ucyYKICAgICBUcmFuc2Zvcm1hdGlv
bk1hdHJpeCByZXBsaWNhTWF0cml4OwogICAgIGlmIChtX3N0YXRlLnJlcGxpY2FMYXllcikgewog
ICAgICAgICByZXBsaWNhTWF0cml4ID0gcmVwbGljYVRyYW5zZm9ybSgpOwotICAgICAgICBib3Vu
ZGluZ1JlY3QudW5pdGUocmVwbGljYU1hdHJpeC5tYXBSZWN0KGJvdW5kaW5nUmVjdCkpOworICAg
ICAgICBsb2NhbEJvdW5kaW5nUmVjdC51bml0ZShyZXBsaWNhTWF0cml4Lm1hcFJlY3QobG9jYWxC
b3VuZGluZ1JlY3QpKTsKICAgICB9CiAKLSAgICBib3VuZGluZ1JlY3QgPSB0cmFuc2Zvcm0ubWFw
UmVjdChib3VuZGluZ1JlY3QpOworICAgIEludFJlY3QgY2xpcEJvdW5kcyhvcHRpb25zLnRleHR1
cmVNYXBwZXIuY2xpcEJvdW5kcygpKTsKKyAgICBjbGlwQm91bmRzLm1vdmUoLW9wdGlvbnMub2Zm
c2V0KTsKKworICAgIEludFJlY3Qgdmlld3BvcnRCb3VuZGluZ1JlY3QgPSBlbmNsb3NpbmdJbnRS
ZWN0KHRyYW5zZm9ybS5tYXBSZWN0KGxvY2FsQm91bmRpbmdSZWN0KSk7CisgICAgdmlld3BvcnRC
b3VuZGluZ1JlY3QuaW50ZXJzZWN0KGNsaXBCb3VuZHMpOwogCiAgICAgLy8gQ291bnQgYWxsIG1h
c2tzIGFuZCBmaWx0ZXJzIGFzIG92ZXJsYXAgbGF5ZXJzLgogICAgIGlmIChoYXNGaWx0ZXJzKCkg
fHwgbV9zdGF0ZS5tYXNrTGF5ZXIgfHwgKG1fc3RhdGUucmVwbGljYUxheWVyICYmIG1fc3RhdGUu
cmVwbGljYUxheWVyLT5tX3N0YXRlLm1hc2tMYXllcikpIHsKLSAgICAgICAgUmVnaW9uIG5ld092
ZXJsYXBSZWdpb24oZW5jbG9zaW5nSW50UmVjdChib3VuZGluZ1JlY3QpKTsKKyAgICAgICAgUmVn
aW9uIG5ld092ZXJsYXBSZWdpb24odmlld3BvcnRCb3VuZGluZ1JlY3QpOwogICAgICAgICBub25P
dmVybGFwUmVnaW9uLnN1YnRyYWN0KG5ld092ZXJsYXBSZWdpb24pOwogICAgICAgICBvdmVybGFw
UmVnaW9uLnVuaXRlKG5ld092ZXJsYXBSZWdpb24pOwogICAgICAgICByZXR1cm47CiAgICAgfQog
CiAgICAgUmVnaW9uIG5ld092ZXJsYXBSZWdpb247Ci0gICAgUmVnaW9uIG5ld05vbk92ZXJsYXBS
ZWdpb24oZW5jbG9zaW5nSW50UmVjdChib3VuZGluZ1JlY3QpKTsKKyAgICBSZWdpb24gbmV3Tm9u
T3ZlcmxhcFJlZ2lvbih2aWV3cG9ydEJvdW5kaW5nUmVjdCk7CiAKICAgICBpZiAoIW1fc3RhdGUu
bWFza3NUb0JvdW5kcykgewogICAgICAgICBmb3IgKGF1dG8qIGNoaWxkIDogbV9jaGlsZHJlbikK
QEAgLTQwOCw5ICs0MTIsNiBAQCB2b2lkIFRleHR1cmVNYXBwZXJMYXllcjo6cGFpbnRVc2luZ092
ZXJsYXBSZWdpb25zKGNvbnN0IFRleHR1cmVNYXBwZXJQYWludE9wdGlvbgogICAgIGF1dG8gcmVj
dHMgPSBub25PdmVybGFwUmVnaW9uLnJlY3RzKCk7CiAKICAgICBmb3IgKGF1dG8mIHJlY3QgOiBy
ZWN0cykgewotICAgICAgICBpZiAoIXJlY3QuaW50ZXJzZWN0cyhvcHRpb25zLnRleHR1cmVNYXBw
ZXIuY2xpcEJvdW5kcygpKSkKLSAgICAgICAgICAgIGNvbnRpbnVlOwotCiAgICAgICAgIG9wdGlv
bnMudGV4dHVyZU1hcHBlci5iZWdpbkNsaXAoVHJhbnNmb3JtYXRpb25NYXRyaXgoKSwgRmxvYXRS
b3VuZGVkUmVjdChyZWN0KSk7CiAgICAgICAgIHBhaW50U2VsZkFuZENoaWxkcmVuV2l0aFJlcGxp
Y2Eob3B0aW9ucyk7CiAgICAgICAgIG9wdGlvbnMudGV4dHVyZU1hcHBlci5lbmRDbGlwKCk7CkBA
IC00MjQsMTUgKzQyNSwxMSBAQCB2b2lkIFRleHR1cmVNYXBwZXJMYXllcjo6cGFpbnRVc2luZ092
ZXJsYXBSZWdpb25zKGNvbnN0IFRleHR1cmVNYXBwZXJQYWludE9wdGlvbgogICAgIH0KIAogICAg
IEludFNpemUgbWF4VGV4dHVyZVNpemUgPSBvcHRpb25zLnRleHR1cmVNYXBwZXIubWF4VGV4dHVy
ZVNpemUoKTsKLSAgICBJbnRSZWN0IGFkanVzdGVkQ2xpcEJvdW5kcyhvcHRpb25zLnRleHR1cmVN
YXBwZXIuY2xpcEJvdW5kcygpKTsKLSAgICBhZGp1c3RlZENsaXBCb3VuZHMubW92ZSgtb3B0aW9u
cy5vZmZzZXQpOwogICAgIGZvciAoYXV0byYgcmVjdCA6IHJlY3RzKSB7CiAgICAgICAgIGZvciAo
aW50IHggPSByZWN0LngoKTsgeCA8IHJlY3QubWF4WCgpOyB4ICs9IG1heFRleHR1cmVTaXplLndp
ZHRoKCkpIHsKICAgICAgICAgICAgIGZvciAoaW50IHkgPSByZWN0LnkoKTsgeSA8IHJlY3QubWF4
WSgpOyB5ICs9IG1heFRleHR1cmVTaXplLmhlaWdodCgpKSB7CiAgICAgICAgICAgICAgICAgSW50
UmVjdCB0aWxlUmVjdChJbnRQb2ludCh4LCB5KSwgbWF4VGV4dHVyZVNpemUpOwogICAgICAgICAg
ICAgICAgIHRpbGVSZWN0LmludGVyc2VjdChyZWN0KTsKLSAgICAgICAgICAgICAgICBpZiAoIXRp
bGVSZWN0LmludGVyc2VjdHMoYWRqdXN0ZWRDbGlwQm91bmRzKSkKLSAgICAgICAgICAgICAgICAg
ICAgY29udGludWU7CiAKICAgICAgICAgICAgICAgICBwYWludFdpdGhJbnRlcm1lZGlhdGVTdXJm
YWNlKG9wdGlvbnMsIHRpbGVSZWN0KTsKICAgICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL0xheW91
dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBlNjdiNDI4MjQw
NTczODAyNzc1YzhlODY1ZTk1YjhjZmY1MzE4MzdiLi5mYTM3MjA4MGY5ZDI5ZGFjYjJmZDA2OTU3
ZmVkNGM3ZGMyOTc0NzU5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIv
TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMTEtMDEgIEZ1amlp
IEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgW1RleHR1cmVN
YXBwZXJdIENyYXNoZWQgaW4gVGV4dHVyZU1hcHBlckxheWVyOjpwYWludFVzaW5nT3ZlcmxhcFJl
Z2lvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx
NDgxNworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjY0ODkwOTA+CisKKyAgICAgICAgUmV2aWV3
ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBjb21wb3NpdGluZy90aWxpbmcvaHVn
ZS1sYXllci13aXRoLW9wYWNpdHktZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogY29t
cG9zaXRpbmcvdGlsaW5nL2h1Z2UtbGF5ZXItd2l0aC1vcGFjaXR5Lmh0bWw6IEFkZGVkLgorCiAy
MDIwLTExLTAxICBLYXJsIFJhY2tsZXIgIDxyYWNrbGVyQGFwcGxlLmNvbT4KIAogICAgICAgICBS
RUdSRVNTSU9OIChyMjY5MDcwKTogWyBCaWcgU3VyIF0gZWRpdGluZy9pbnB1dC9yZXZlYWwtY2Fy
ZXQtb2YtbXVsdGlsaW5lLWlucHV0Lmh0bWwgaXMgYSBjb25zdGFudCBmYWlsdXJlCmRpZmYgLS1n
aXQgYS9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy90aWxpbmcvaHVnZS1sYXllci13aXRoLW9wYWNp
dHktZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL3RpbGluZy9odWdlLWxh
eWVyLXdpdGgtb3BhY2l0eS1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4
IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjhiMzAxMjhkNWE0Mzdm
YzVhNjRiOGU0YjcwYTYxODc2ZDViOTNmYWIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0
cy9jb21wb3NpdGluZy90aWxpbmcvaHVnZS1sYXllci13aXRoLW9wYWNpdHktZXhwZWN0ZWQuaHRt
bApAQCAtMCwwICsxLDI3IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorICAgIDxoZWFkPgor
ICAgICAgICA8bWV0YSBjaGFyc2V0PSJ1dGYtOCI+CisgICAgICAgIDxzdHlsZT4KKyAgICAgICAg
ICAgIGh0bWwgeworICAgICAgICAgICAgICAgIG92ZXJmbG93OiBoaWRkZW47CisgICAgICAgICAg
ICB9CisgICAgICAgICAgICBkaXYgeworICAgICAgICAgICAgICAgIHdpZHRoOiAxMDAwcHg7Cisg
ICAgICAgICAgICAgICAgaGVpZ2h0OiAxMDAwcHg7CisgICAgICAgICAgICAgICAgYmFja2dyb3Vu
ZDogZ3JlZW47CisgICAgICAgICAgICAgICAgYm9yZGVyOiAxMHB4IHNvbGlkIGJsdWU7CisgICAg
ICAgICAgICAgICAgb3BhY2l0eTogMC41OworICAgICAgICAgICAgICAgIHdpbGwtY2hhbmdlOiB0
cmFuc2Zvcm07CisgICAgICAgICAgICB9CisgICAgICAgIDwvc3R5bGU+CisgICAgPC9oZWFkPgor
ICAgIDxib2R5PgorICAgICAgICBSZW5kZXJpbmcgYSBodWdlIG9wYWNpdHkgbGF5ZXIgc2hvdWxk
bid0IGNyYXNoIDxhIGhyZWY9Imh0dHBzOi8vd2Via2l0Lm9yZy9iLzIxNDgxNyI+QnVnIDIxNDgx
NzwvYT4uCisgICAgICAgIDxkaXY+CisgICAgICAgICAgICA8ZGl2PgorICAgICAgICAgICAgICAg
IDxkaXY+PC9kaXY+CisgICAgICAgICAgICA8L2Rpdj4KKyAgICAgICAgPC9kaXY+CisgICAgPC9i
b2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvdGlsaW5n
L2h1Z2UtbGF5ZXItd2l0aC1vcGFjaXR5Lmh0bWwgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy90
aWxpbmcvaHVnZS1sYXllci13aXRoLW9wYWNpdHkuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NApp
bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi44MDg0ODA3YzZj
NWM3ZjU2YmUxZDhiNjkxMThmN2UzN2ZlNzc5M2FkCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0
VGVzdHMvY29tcG9zaXRpbmcvdGlsaW5nL2h1Z2UtbGF5ZXItd2l0aC1vcGFjaXR5Lmh0bWwKQEAg
LTAsMCArMSwyNyBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKyAgICA8aGVhZD4KKyAgICAg
ICAgPG1ldGEgY2hhcnNldD0idXRmLTgiPgorICAgICAgICA8c3R5bGU+CisgICAgICAgICAgICBo
dG1sIHsKKyAgICAgICAgICAgICAgICBvdmVyZmxvdzogaGlkZGVuOworICAgICAgICAgICAgfQor
ICAgICAgICAgICAgZGl2IHsKKyAgICAgICAgICAgICAgICB3aWR0aDogMTAwMDAwcHg7CisgICAg
ICAgICAgICAgICAgaGVpZ2h0OiAxMDAwMDBweDsKKyAgICAgICAgICAgICAgICBiYWNrZ3JvdW5k
OiBncmVlbjsKKyAgICAgICAgICAgICAgICBib3JkZXI6IDEwcHggc29saWQgYmx1ZTsKKyAgICAg
ICAgICAgICAgICBvcGFjaXR5OiAwLjU7CisgICAgICAgICAgICAgICAgd2lsbC1jaGFuZ2U6IHRy
YW5zZm9ybTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgPC9zdHlsZT4KKyAgICA8L2hlYWQ+Cisg
ICAgPGJvZHk+CisgICAgICAgIFJlbmRlcmluZyBhIGh1Z2Ugb3BhY2l0eSBsYXllciBzaG91bGRu
J3QgY3Jhc2ggPGEgaHJlZj0iaHR0cHM6Ly93ZWJraXQub3JnL2IvMjE0ODE3Ij5CdWcgMjE0ODE3
PC9hPi4KKyAgICAgICAgPGRpdj4KKyAgICAgICAgICAgIDxkaXY+CisgICAgICAgICAgICAgICAg
PGRpdj48L2Rpdj4KKyAgICAgICAgICAgIDwvZGl2PgorICAgICAgICA8L2Rpdj4KKyAgICA8L2Jv
ZHk+Cis8L2h0bWw+Cg==
</data>

          </attachment>
      

    </bug>

</bugzilla>