<?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>66031</bug_id>
          
          <creation_ts>2011-08-10 22:30:13 -0700</creation_ts>
          <short_desc>Chromium plumbing for webkitRequestFullScreen</short_desc>
          <delta_ts>2011-08-18 18:17:41 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>New Bugs</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="James Kozianski">koz</reporter>
          <assigned_to name="James Kozianski">koz</assigned_to>
          <cc>abarth</cc>
    
    <cc>dglazkov</cc>
    
    <cc>fishd</cc>
    
    <cc>webkit.review.bot</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>449597</commentid>
    <comment_count>0</comment_count>
    <who name="James Kozianski">koz</who>
    <bug_when>2011-08-10 22:30:13 -0700</bug_when>
    <thetext>Chromium plumbing for webkitRequestFullScreen</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>449599</commentid>
    <comment_count>1</comment_count>
      <attachid>103577</attachid>
    <who name="James Kozianski">koz</who>
    <bug_when>2011-08-10 22:33:23 -0700</bug_when>
    <thetext>Created attachment 103577
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>449600</commentid>
    <comment_count>2</comment_count>
      <attachid>103577</attachid>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2011-08-10 22:37:50 -0700</bug_when>
    <thetext>Comment on attachment 103577
Patch

Attachment 103577 did not pass chromium-ews (chromium-xvfb):
Output: http://queues.webkit.org/results/9358062</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>449639</commentid>
    <comment_count>3</comment_count>
      <attachid>103577</attachid>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2011-08-11 00:13:53 -0700</bug_when>
    <thetext>Comment on attachment 103577
Patch

Attachment 103577 did not pass cr-mac-ews (chromium):
Output: http://queues.webkit.org/results/9352079</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>451362</commentid>
    <comment_count>4</comment_count>
      <attachid>103577</attachid>
    <who name="Darin Fisher (:fishd, Google)">fishd</who>
    <bug_when>2011-08-15 16:18:32 -0700</bug_when>
    <thetext>Comment on attachment 103577
Patch

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

&gt; Source/WebKit/chromium/public/WebView.h:366
&gt;  

add another new line here

&gt; Source/WebKit/chromium/public/WebView.h:367
&gt; +    // Fullscreen -----------------------------------------------------------

nit: new line after the section break

&gt; Source/WebKit/chromium/public/WebView.h:369
&gt; +

though folks have not been entirely consistent, we have a convention of putting two new
lines at the end of a section.  so, add another new line here.

&gt; Source/WebKit/chromium/public/WebViewClient.h:218
&gt; +    virtual void enterFullscreenForElement() { }

shouldn&apos;t we pass a WebElement to these functions?  if not, then the functions
should probably be renamed to not have the ForElement suffix.

what&apos;s the difference between these functions and the ForNode variants?  why
do we need both?

&gt; Source/WebKit/chromium/src/ChromeClientImpl.cpp:914
&gt; +    // be restructured to wait for an ACK from the browser that we did enter

we normally try to avoid leaving comments in this code that reference the
multi-process architecture details of Chromium.  they can easily bit-rot
since people on the Chromium side might be unlikely to fix up comments
here.  maybe you should just talk in terms of &quot;the embedder&quot; needing to
notify you asynchronously, etc.

&gt; Source/WebKit/chromium/src/WebViewImpl.cpp:2680
&gt; +    Element* fullscreenElement = page()-&gt;mainFrame()-&gt;document()-&gt;webkitCurrentFullScreenElement();

it might be nice to cache a pointer to the m_page-&gt;mainFrame()-&gt;document() in a local variable
to help readability since you reuse that expression a lot.

&gt; Source/WebKit/chromium/src/WebViewImpl.cpp:2681
&gt; +    if (fullscreenElement)

shouldn&apos;t this be a &quot;if (!fullscreenElement)&quot;?  i would think that if we have a full screen element that we would want to exit full screen mode.

&gt; Source/WebKit/chromium/src/WebViewImpl.h:375
&gt; +    virtual void exitFullscreen();

there is actually a section in WebViewImpl.h that is dedicated for listing
the methods of WebView in the same order as they appear in the header file.
unfortunately, the folks who authored setVisibilityState and graphicsContext3D
did not follow that rule.  please don&apos;t add to that mess :-)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>451459</commentid>
    <comment_count>5</comment_count>
      <attachid>103577</attachid>
    <who name="James Kozianski">koz</who>
    <bug_when>2011-08-15 20:13:09 -0700</bug_when>
    <thetext>Comment on attachment 103577
Patch

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

&gt;&gt; Source/WebKit/chromium/public/WebView.h:366

&gt; 
&gt; add another new line here

Done.

&gt;&gt; Source/WebKit/chromium/public/WebView.h:369
&gt;&gt; +
&gt; 
&gt; though folks have not been entirely consistent, we have a convention of putting two new
&gt; lines at the end of a section.  so, add another new line here.

Done.

&gt;&gt; Source/WebKit/chromium/public/WebViewClient.h:218
&gt;&gt; +    virtual void enterFullscreenForElement() { }
&gt; 
&gt; shouldn&apos;t we pass a WebElement to these functions?  if not, then the functions
&gt; should probably be renamed to not have the ForElement suffix.
&gt; 
&gt; what&apos;s the difference between these functions and the ForNode variants?  why
&gt; do we need both?

The ForNode variants seem to be a WebKit specific way to do fullscreen specifically for video elements. In HTMLMediaElement.cpp there is code added by jer.noble@apple.com that short-circuits the calls to enterFullscreenForNode(Node*) with calls to document-&gt;requestFullscreenForElement(Element*) if FULLSCREEN_API is enabled, so it seems that enterFullscreenForNode() is deprecated (as it seems that Safari builds with FULLSCREEN_API on?)

The ForNode variants are NOTIMPLEMNTED() in Chromium, but they are plumbed through to RenderView. Should I &quot;hijack&quot; them and remove the ForElement() ones? My feeling is that it would be best to leave the ForElement() functions as they are and try and remove the apparently deprecated ForNode() variants. In fact, hijacking them would be messy because they accept Node*s, not Element*s.

I&apos;ve called them *ForElement because it is the fullscreen mode that focuses the renderer around an element, which is different to the embedder simply entering fullscreen mode. That is, toggling the browser into fullscreen with the button is different to a site going fullscreen.

&gt;&gt; Source/WebKit/chromium/src/ChromeClientImpl.cpp:914
&gt;&gt; +    // be restructured to wait for an ACK from the browser that we did enter
&gt; 
&gt; we normally try to avoid leaving comments in this code that reference the
&gt; multi-process architecture details of Chromium.  they can easily bit-rot
&gt; since people on the Chromium side might be unlikely to fix up comments
&gt; here.  maybe you should just talk in terms of &quot;the embedder&quot; needing to
&gt; notify you asynchronously, etc.

Okay. I&apos;ve updated the comment.

&gt;&gt; Source/WebKit/chromium/src/WebViewImpl.cpp:2680
&gt;&gt; +    Element* fullscreenElement = page()-&gt;mainFrame()-&gt;document()-&gt;webkitCurrentFullScreenElement();
&gt; 
&gt; it might be nice to cache a pointer to the m_page-&gt;mainFrame()-&gt;document() in a local variable
&gt; to help readability since you reuse that expression a lot.

Done.

&gt;&gt; Source/WebKit/chromium/src/WebViewImpl.cpp:2681
&gt;&gt; +    if (fullscreenElement)
&gt; 
&gt; shouldn&apos;t this be a &quot;if (!fullscreenElement)&quot;?  i would think that if we have a full screen element that we would want to exit full screen mode.

Yep, that&apos;s right. Sorry, this was amongst some local changes I&apos;d made but forgot to upload.

&gt;&gt; Source/WebKit/chromium/src/WebViewImpl.h:375
&gt;&gt; +    virtual void exitFullscreen();
&gt; 
&gt; there is actually a section in WebViewImpl.h that is dedicated for listing
&gt; the methods of WebView in the same order as they appear in the header file.
&gt; unfortunately, the folks who authored setVisibilityState and graphicsContext3D
&gt; did not follow that rule.  please don&apos;t add to that mess :-)

Done.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>451481</commentid>
    <comment_count>6</comment_count>
      <attachid>104002</attachid>
    <who name="James Kozianski">koz</who>
    <bug_when>2011-08-15 21:23:20 -0700</bug_when>
    <thetext>Created attachment 104002
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>452096</commentid>
    <comment_count>7</comment_count>
    <who name="Darin Fisher (:fishd, Google)">fishd</who>
    <bug_when>2011-08-16 21:00:07 -0700</bug_when>
    <thetext>(In reply to comment #5)
&gt; The ForNode variants seem to be a WebKit specific way to do fullscreen specifically for video elements. In HTMLMediaElement.cpp there is code added by jer.noble@apple.com that short-circuits the calls to enterFullscreenForNode(Node*) with calls to document-&gt;requestFullscreenForElement(Element*) if FULLSCREEN_API is enabled, so it seems that enterFullscreenForNode() is deprecated (as it seems that Safari builds with FULLSCREEN_API on?)
&gt; 
&gt; The ForNode variants are NOTIMPLEMNTED() in Chromium, but they are plumbed through to RenderView. Should I &quot;hijack&quot; them and remove the ForElement() ones? My feeling is that it would be best to leave the ForElement() functions as they are and try and remove the apparently deprecated ForNode() variants. In fact, hijacking them would be messy because they accept Node*s, not Element*s.
&gt; 
&gt; I&apos;ve called them *ForElement because it is the fullscreen mode that focuses the renderer around an element, which is different to the embedder simply entering fullscreen mode. That is, toggling the browser into fullscreen with the button is different to a site going fullscreen.

Ah!  Makes sense now.  The ForNode methods are probably the leftovers from the work that scherkus&apos; intern did to try to implement fullscreen mode for video.  I agree that it should be deleted in place of these new methods.

However, I still don&apos;t see the point in calling these ForElement.  From the point of view of the browser, the only significant difference between F11 and webkitRequestFullscreen is the latter is content-initiated.  That means the browser may need to present different UI to the user.  The browser won&apos;t otherwise care at all about what is focused in the page.

I also think it is consistent to drop the ForElement suffix since that normally implies that there will be a corresponding parameter of type WebElement, but you don&apos;t pass such a parameter.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>452100</commentid>
    <comment_count>8</comment_count>
      <attachid>104002</attachid>
    <who name="Darin Fisher (:fishd, Google)">fishd</who>
    <bug_when>2011-08-16 21:03:29 -0700</bug_when>
    <thetext>Comment on attachment 104002
Patch

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

By the way, if you think that ForElement is the best suffix, then just pass a WebElement parameter like the ChromeClient methods do.

&gt; Source/WebKit/chromium/public/WebView.h:367
&gt; +    // Fullscreen -----------------------------------------------------------

sorry to be a nut about whitespace, but i had intended for there to be two blank
lines above each section heading.  apparently, a good number of people haven&apos;t
been following that convention, but if you scroll up far enough, you&apos;ll see that
convention in place.  sigh :(</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>452713</commentid>
    <comment_count>9</comment_count>
    <who name="James Kozianski">koz</who>
    <bug_when>2011-08-17 16:30:27 -0700</bug_when>
    <thetext>(In reply to comment #7)
&gt; (In reply to comment #5)
&gt; &gt; The ForNode variants seem to be a WebKit specific way to do fullscreen specifically for video elements. In HTMLMediaElement.cpp there is code added by jer.noble@apple.com that short-circuits the calls to enterFullscreenForNode(Node*) with calls to document-&gt;requestFullscreenForElement(Element*) if FULLSCREEN_API is enabled, so it seems that enterFullscreenForNode() is deprecated (as it seems that Safari builds with FULLSCREEN_API on?)
&gt; &gt; 
&gt; &gt; The ForNode variants are NOTIMPLEMNTED() in Chromium, but they are plumbed through to RenderView. Should I &quot;hijack&quot; them and remove the ForElement() ones? My feeling is that it would be best to leave the ForElement() functions as they are and try and remove the apparently deprecated ForNode() variants. In fact, hijacking them would be messy because they accept Node*s, not Element*s.
&gt; &gt; 
&gt; &gt; I&apos;ve called them *ForElement because it is the fullscreen mode that focuses the renderer around an element, which is different to the embedder simply entering fullscreen mode. That is, toggling the browser into fullscreen with the button is different to a site going fullscreen.
&gt; 
&gt; Ah!  Makes sense now.  The ForNode methods are probably the leftovers from the work that scherkus&apos; intern did to try to implement fullscreen mode for video.  I agree that it should be deleted in place of these new methods.
&gt; 
&gt; However, I still don&apos;t see the point in calling these ForElement.  From the point of view of the browser, the only significant difference between F11 and webkitRequestFullscreen is the latter is content-initiated.  That means the browser may need to present different UI to the user.  The browser won&apos;t otherwise care at all about what is focused in the page.
&gt; 
&gt; I also think it is consistent to drop the ForElement suffix since that normally implies that there will be a corresponding parameter of type WebElement, but you don&apos;t pass such a parameter.

Yep, that makes sense. I&apos;ve dropped the suffix.

&gt;&gt; Source/WebKit/chromium/public/WebView.h:367
&gt; sorry to be a nut about whitespace, but i had intended for there to be two blank
&gt; lines above each section heading.  apparently, a good number of people haven&apos;t
&gt; been following that convention, but if you scroll up far enough, you&apos;ll see that
&gt; convention in place.  sigh :(

Sorry, my bad! Done.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>452722</commentid>
    <comment_count>10</comment_count>
      <attachid>104281</attachid>
    <who name="James Kozianski">koz</who>
    <bug_when>2011-08-17 16:39:50 -0700</bug_when>
    <thetext>Created attachment 104281
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>452832</commentid>
    <comment_count>11</comment_count>
      <attachid>104301</attachid>
    <who name="James Kozianski">koz</who>
    <bug_when>2011-08-17 20:36:05 -0700</bug_when>
    <thetext>Created attachment 104301
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>452836</commentid>
    <comment_count>12</comment_count>
      <attachid>104302</attachid>
    <who name="James Kozianski">koz</who>
    <bug_when>2011-08-17 20:48:42 -0700</bug_when>
    <thetext>Created attachment 104302
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>453024</commentid>
    <comment_count>13</comment_count>
      <attachid>104302</attachid>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2011-08-18 07:19:14 -0700</bug_when>
    <thetext>Comment on attachment 104302
Patch for landing

Rejecting attachment 104302 from commit-queue.

Failed to run &quot;[&apos;./Tools/Scripts/webkit-patch&apos;, &apos;--status-host=queues.webkit.org&apos;, &apos;--bot-id=ec2-cq-02&apos;, &apos;--port...&quot; exit_code: 2

Last 500 characters of output:
Kit2/ChangeLog
Failed to merge in the changes.
Patch failed at 0001 Dump-as-markup conversion: editing/pasteboard/paste-text-010.html and editing/pasteboard/paste-text-015.html

When you have resolved this problem run &quot;git rebase --continue&quot;.
If you would prefer to skip this patch, instead run &quot;git rebase --skip&quot;.
To restore the original branch and stop rebasing run &quot;git rebase --abort&quot;.

rebase refs/remotes/origin/master: command returned error: 1

Died at Tools/Scripts/update-webkit line 146.

Full output: http://queues.webkit.org/results/9421630</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>453519</commentid>
    <comment_count>14</comment_count>
      <attachid>104429</attachid>
    <who name="James Kozianski">koz</who>
    <bug_when>2011-08-18 17:48:53 -0700</bug_when>
    <thetext>Created attachment 104429
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>453531</commentid>
    <comment_count>15</comment_count>
      <attachid>104429</attachid>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2011-08-18 18:17:35 -0700</bug_when>
    <thetext>Comment on attachment 104429
Patch for landing

Clearing flags on attachment: 104429

Committed r93381: &lt;http://trac.webkit.org/changeset/93381&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>453532</commentid>
    <comment_count>16</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2011-08-18 18:17:41 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>103577</attachid>
            <date>2011-08-10 22:33:23 -0700</date>
            <delta_ts>2011-08-15 21:23:12 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-66031-20110811153320.patch</filename>
            <type>text/plain</type>
            <size>5148</size>
            <attacher name="James Kozianski">koz</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogOTEyNjEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy
b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg
MTFiMmRlMDgwNGU4ODg4YWI0MzU5NTE1YTlhMDU1YWVlMjQwZDZiMy4uYmNlNzg5OGQ5OTllMGMz
NzdhOWJiYTYyZmRlMzk4MmQ3M2Y2NDg4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv
bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg
LTEsMyArMSwyMSBAQAorMjAxMS0wOC0xMCAgSmFtZXMgS296aWFuc2tpICA8a296QGNocm9taXVt
Lm9yZz4KKworICAgICAgICBDaHJvbWl1bSBwbHVtYmluZyBmb3Igd2Via2l0UmVxdWVzdEZ1bGxT
Y3JlZW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2
MDMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBw
dWJsaWMvV2ViVmlldy5oOgorICAgICAgICAqIHB1YmxpYy9XZWJWaWV3Q2xpZW50Lmg6CisgICAg
ICAgIChXZWJLaXQ6OldlYlZpZXdDbGllbnQ6OmVudGVyRnVsbHNjcmVlbkZvckVsZW1lbnQpOgor
ICAgICAgICAoV2ViS2l0OjpXZWJWaWV3Q2xpZW50OjpleGl0RnVsbHNjcmVlbkZvckVsZW1lbnQp
OgorICAgICAgICAqIHNyYy9DaHJvbWVDbGllbnRJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6
Q2hyb21lQ2xpZW50SW1wbDo6ZW50ZXJGdWxsU2NyZWVuRm9yRWxlbWVudCk6CisgICAgICAgIChX
ZWJLaXQ6OkNocm9tZUNsaWVudEltcGw6OmV4aXRGdWxsU2NyZWVuRm9yRWxlbWVudCk6CisgICAg
ICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6
OmV4aXRGdWxsc2NyZWVuKToKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuaDoKKwogMjAxMS0w
Ny0xOSAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBb
Q2hyb21pdW1dIFdlYiBJbnNwZWN0b3I6IGFkZCBzYW5pdHkgdGVzdCBmb3Igc2hhcmVkIHdvcmtl
ciBpbnNwZWN0b3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dl
YlZpZXcuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlZpZXcuaAppbmRleCA5
MTQ4ZDcwM2JhZjlkZDhhNGYwNDhhNjZiMzY5ZTIwMWU1ZWQyOTJjLi44NzU5ZDI3OGVkOGU5OTU4
NjlmOThmNmQyNTU1ZmJiMzIzYzNlMTAyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9t
aXVtL3B1YmxpYy9XZWJWaWV3LmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMv
V2ViVmlldy5oCkBAIC0zNjQsNiArMzY0LDkgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBz
ZXRWaXNpYmlsaXR5U3RhdGUoV2ViUGFnZVZpc2liaWxpdHlTdGF0ZSB2aXNpYmlsaXR5U3RhdGUs
CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBib29sIGlzSW5pdGlhbFN0YXRl
KSB7IH0KIAorICAgIC8vIEZ1bGxzY3JlZW4gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KKyAgICB2aXJ0dWFsIHZvaWQgZXhpdEZ1bGxz
Y3JlZW4oKSA9IDA7CisKIHByb3RlY3RlZDoKICAgICB+V2ViVmlldygpIHt9CiB9OwpkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlld0NsaWVudC5oIGIvU291
cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlld0NsaWVudC5oCmluZGV4IDg5OTg2YjJm
Nzg5ZDNmNDFlNzY2ZTBkZjhlYjE0YmQwYTE0ZTAxYWQuLjgzYWI2NGUwOGIxYjAyNTIyN2Y4MTYy
OTg2YTMzMjEwNTc5YzE0YTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVi
bGljL1dlYlZpZXdDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9X
ZWJWaWV3Q2xpZW50LmgKQEAgLTIxNSw2ICsyMTUsOCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBi
b29sIHN1cHBvcnRzRnVsbHNjcmVlbigpIHsgcmV0dXJuIGZhbHNlOyB9CiAgICAgdmlydHVhbCB2
b2lkIGVudGVyRnVsbHNjcmVlbkZvck5vZGUoY29uc3QgV2ViTm9kZSYpIHsgfQogICAgIHZpcnR1
YWwgdm9pZCBleGl0RnVsbHNjcmVlbkZvck5vZGUoY29uc3QgV2ViTm9kZSYpIHsgfQorICAgIHZp
cnR1YWwgdm9pZCBlbnRlckZ1bGxzY3JlZW5Gb3JFbGVtZW50KCkgeyB9CisgICAgdmlydHVhbCB2
b2lkIGV4aXRGdWxsc2NyZWVuRm9yRWxlbWVudCgpIHsgfQogCiAgICAgLy8gVUkgLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudElt
cGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHAK
aW5kZXggYTNlOWIwZmQ5M2JiOGMwZTYzNmE5YjZiMzFhM2IxNWE2Nzg1Y2Y4Zi4uZTJkMmM0MmVl
MDQ5NDdkZWQ0MzJjYjQwNjIwYzljNzEwOGRlOGRlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp
dC9jaHJvbWl1bS9zcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9j
aHJvbWl1bS9zcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHAKQEAgLTkxMCw4ICs5MTAsMTIgQEAgYm9v
bCBDaHJvbWVDbGllbnRJbXBsOjpzdXBwb3J0c0Z1bGxTY3JlZW5Gb3JFbGVtZW50KGNvbnN0IFdl
YkNvcmU6OkVsZW1lbnQqIGVsZW0KIAogdm9pZCBDaHJvbWVDbGllbnRJbXBsOjplbnRlckZ1bGxT
Y3JlZW5Gb3JFbGVtZW50KFdlYkNvcmU6OkVsZW1lbnQqIGVsZW1lbnQpCiB7CisgICAgLy8gRklY
TUU6IGVudGVyRnVsbHNjcmVlbkZvckVsZW1lbnQoKSBpcyBhc3luY2hyb25vdXMsIHNvIHRoaXMg
Y29kZSBzaG91bGQKKyAgICAvLyBiZSByZXN0cnVjdHVyZWQgdG8gd2FpdCBmb3IgYW4gQUNLIGZy
b20gdGhlIGJyb3dzZXIgdGhhdCB3ZSBkaWQgZW50ZXIKKyAgICAvLyBmdWxsc2NyZWVuIGJlZm9y
ZSBjYWxsaW5nIHdlYmtpdERpZEVudGVyRnVsbFNjcmVlbkZvckVsZW1lbnQuCiAgICAgLy8gRklY
TUU6IFdlIG1heSBuZWVkIHRvIGNhbGwgdGhlc2Ugc29tZXBsYWNlIGVsc2Ugd2hlbiB3aW5kb3cg
cmVzaXplcy4KICAgICBlbGVtZW50LT5kb2N1bWVudCgpLT53ZWJraXRXaWxsRW50ZXJGdWxsU2Ny
ZWVuRm9yRWxlbWVudChlbGVtZW50KTsKKyAgICBtX3dlYlZpZXctPmNsaWVudCgpLT5lbnRlckZ1
bGxzY3JlZW5Gb3JFbGVtZW50KCk7CiAgICAgZWxlbWVudC0+ZG9jdW1lbnQoKS0+d2Via2l0RGlk
RW50ZXJGdWxsU2NyZWVuRm9yRWxlbWVudChlbGVtZW50KTsKIH0KIApAQCAtOTE5LDYgKzkyMyw3
IEBAIHZvaWQgQ2hyb21lQ2xpZW50SW1wbDo6ZXhpdEZ1bGxTY3JlZW5Gb3JFbGVtZW50KFdlYkNv
cmU6OkVsZW1lbnQqIGVsZW1lbnQpCiB7CiAgICAgLy8gRklYTUU6IFdlIG1heSBuZWVkIHRvIGNh
bGwgdGhlc2Ugc29tZXBsYWNlIGVsc2Ugd2hlbiB3aW5kb3cgcmVzaXplcy4KICAgICBlbGVtZW50
LT5kb2N1bWVudCgpLT53ZWJraXRXaWxsRXhpdEZ1bGxTY3JlZW5Gb3JFbGVtZW50KGVsZW1lbnQp
OworICAgIG1fd2ViVmlldy0+Y2xpZW50KCktPmV4aXRGdWxsc2NyZWVuRm9yRWxlbWVudCgpOwog
ICAgIGVsZW1lbnQtPmRvY3VtZW50KCktPndlYmtpdERpZEV4aXRGdWxsU2NyZWVuRm9yRWxlbWVu
dChlbGVtZW50KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv
V2ViVmlld0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwu
Y3BwCmluZGV4IGE1YWM4MGRmZjI0OGY4YmUyNTBhZDA3NDJkN2I3ODZjMDRjN2ZhMDEuLjgxNmJl
ZGU4NGUxZDE5MjMzNDdmYzBmNWJkNGRkOGY5Y2Y2ZmQzZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2No
cm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTI2NzUsNCArMjY3NSwxMyBAQCB2b2lkIFdl
YlZpZXdJbXBsOjpzZXRWaXNpYmlsaXR5U3RhdGUoV2ViUGFnZVZpc2liaWxpdHlTdGF0ZSB2aXNp
YmlsaXR5U3RhdGUsCiAjZW5kaWYKIH0KIAordm9pZCBXZWJWaWV3SW1wbDo6ZXhpdEZ1bGxzY3Jl
ZW4oKQoreworICAgIEVsZW1lbnQqIGZ1bGxzY3JlZW5FbGVtZW50ID0gcGFnZSgpLT5tYWluRnJh
bWUoKS0+ZG9jdW1lbnQoKS0+d2Via2l0Q3VycmVudEZ1bGxTY3JlZW5FbGVtZW50KCk7CisgICAg
aWYgKGZ1bGxzY3JlZW5FbGVtZW50KQorICAgICAgICByZXR1cm47CisgICAgcGFnZSgpLT5tYWlu
RnJhbWUoKS0+ZG9jdW1lbnQoKS0+d2Via2l0V2lsbEV4aXRGdWxsU2NyZWVuRm9yRWxlbWVudChm
dWxsc2NyZWVuRWxlbWVudCk7CisgICAgcGFnZSgpLT5tYWluRnJhbWUoKS0+ZG9jdW1lbnQoKS0+
d2Via2l0RGlkRXhpdEZ1bGxTY3JlZW5Gb3JFbGVtZW50KGZ1bGxzY3JlZW5FbGVtZW50KTsKK30K
KwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9t
aXVtL3NyYy9XZWJWaWV3SW1wbC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmll
d0ltcGwuaAppbmRleCAyOWE2NjgyOTAzZWY1ODY5NzM4Y2NkNjE2MmExMDNiOGU1ZmRjN2IzLi40
ZWY4ZTRmNjEwZmNjYjc4ZGIyMTk3YWRiZWI2YWNiMmEyYTM3Y2RlIDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQv
Y2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKQEAgLTM3Miw2ICszNzIsOCBAQCBwdWJsaWM6CiAK
ICAgICB2aXJ0dWFsIHZvaWQgc2V0VmlzaWJpbGl0eVN0YXRlKFdlYlBhZ2VWaXNpYmlsaXR5U3Rh
dGUsIGJvb2wpOwogCisgICAgdmlydHVhbCB2b2lkIGV4aXRGdWxsc2NyZWVuKCk7CisKICAgICBX
ZWJDb3JlOjpQb3B1cENvbnRhaW5lciogc2VsZWN0UG9wdXAoKSBjb25zdCB7IHJldHVybiBtX3Nl
bGVjdFBvcHVwLmdldCgpOyB9CiAKICAgICAvLyBSZXR1cm5zIHRydWUgaWYgdGhlIGV2ZW50IGxl
YWRzIHRvIHNjcm9sbGluZy4K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>104002</attachid>
            <date>2011-08-15 21:23:20 -0700</date>
            <delta_ts>2011-08-17 16:39:42 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-66031-20110816142317.patch</filename>
            <type>text/plain</type>
            <size>5211</size>
            <attacher name="James Kozianski">koz</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogOTEyNjEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy
b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg
MTFiMmRlMDgwNGU4ODg4YWI0MzU5NTE1YTlhMDU1YWVlMjQwZDZiMy4uYmNlNzg5OGQ5OTllMGMz
NzdhOWJiYTYyZmRlMzk4MmQ3M2Y2NDg4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv
bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg
LTEsMyArMSwyMSBAQAorMjAxMS0wOC0xMCAgSmFtZXMgS296aWFuc2tpICA8a296QGNocm9taXVt
Lm9yZz4KKworICAgICAgICBDaHJvbWl1bSBwbHVtYmluZyBmb3Igd2Via2l0UmVxdWVzdEZ1bGxT
Y3JlZW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2
MDMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBw
dWJsaWMvV2ViVmlldy5oOgorICAgICAgICAqIHB1YmxpYy9XZWJWaWV3Q2xpZW50Lmg6CisgICAg
ICAgIChXZWJLaXQ6OldlYlZpZXdDbGllbnQ6OmVudGVyRnVsbHNjcmVlbkZvckVsZW1lbnQpOgor
ICAgICAgICAoV2ViS2l0OjpXZWJWaWV3Q2xpZW50OjpleGl0RnVsbHNjcmVlbkZvckVsZW1lbnQp
OgorICAgICAgICAqIHNyYy9DaHJvbWVDbGllbnRJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6
Q2hyb21lQ2xpZW50SW1wbDo6ZW50ZXJGdWxsU2NyZWVuRm9yRWxlbWVudCk6CisgICAgICAgIChX
ZWJLaXQ6OkNocm9tZUNsaWVudEltcGw6OmV4aXRGdWxsU2NyZWVuRm9yRWxlbWVudCk6CisgICAg
ICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6
OmV4aXRGdWxsc2NyZWVuKToKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuaDoKKwogMjAxMS0w
Ny0xOSAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBb
Q2hyb21pdW1dIFdlYiBJbnNwZWN0b3I6IGFkZCBzYW5pdHkgdGVzdCBmb3Igc2hhcmVkIHdvcmtl
ciBpbnNwZWN0b3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dl
YlZpZXcuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlZpZXcuaAppbmRleCA5
MTQ4ZDcwM2JhZjlkZDhhNGYwNDhhNjZiMzY5ZTIwMWU1ZWQyOTJjLi40NDE0Y2E0ZTU2MTZkYzk3
N2QwZDIwN2YzYTU5OThlNjhjZGI1ZjAwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9t
aXVtL3B1YmxpYy9XZWJWaWV3LmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMv
V2ViVmlldy5oCkBAIC0zNjQsNiArMzY0LDExIEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQg
c2V0VmlzaWJpbGl0eVN0YXRlKFdlYlBhZ2VWaXNpYmlsaXR5U3RhdGUgdmlzaWJpbGl0eVN0YXRl
LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYm9vbCBpc0luaXRpYWxTdGF0
ZSkgeyB9CiAKKyAgICAvLyBGdWxsc2NyZWVuIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCisKKyAgICB2aXJ0dWFsIHZvaWQgZXhpdEZ1
bGxzY3JlZW4oKSA9IDA7CisKKwogcHJvdGVjdGVkOgogICAgIH5XZWJWaWV3KCkge30KIH07CmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3Q2xpZW50Lmgg
Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3Q2xpZW50LmgKaW5kZXggODk5
ODZiMmY3ODlkM2Y0MWU3NjZlMGRmOGViMTRiZDBhMTRlMDFhZC4uODNhYjY0ZTA4YjFiMDI1MjI3
ZjgxNjI5ODZhMzMyMTA1NzljMTRhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1
bS9wdWJsaWMvV2ViVmlld0NsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVi
bGljL1dlYlZpZXdDbGllbnQuaApAQCAtMjE1LDYgKzIxNSw4IEBAIHB1YmxpYzoKICAgICB2aXJ0
dWFsIGJvb2wgc3VwcG9ydHNGdWxsc2NyZWVuKCkgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0
dWFsIHZvaWQgZW50ZXJGdWxsc2NyZWVuRm9yTm9kZShjb25zdCBXZWJOb2RlJikgeyB9CiAgICAg
dmlydHVhbCB2b2lkIGV4aXRGdWxsc2NyZWVuRm9yTm9kZShjb25zdCBXZWJOb2RlJikgeyB9Cisg
ICAgdmlydHVhbCB2b2lkIGVudGVyRnVsbHNjcmVlbkZvckVsZW1lbnQoKSB7IH0KKyAgICB2aXJ0
dWFsIHZvaWQgZXhpdEZ1bGxzY3JlZW5Gb3JFbGVtZW50KCkgeyB9CiAKICAgICAvLyBVSSAtLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21lQ2xp
ZW50SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBs
LmNwcAppbmRleCBhM2U5YjBmZDkzYmI4YzBlNjM2YTliNmIzMWEzYjE1YTY3ODVjZjhmLi4yNTdk
NzMxNjBjMzk5YmRkZjMwZjk3NDU4Njc2YjkwNmJlMDMxYWQ0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2Vi
S2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBsLmNwcApAQCAtOTEwLDggKzkxMCwxMiBA
QCBib29sIENocm9tZUNsaWVudEltcGw6OnN1cHBvcnRzRnVsbFNjcmVlbkZvckVsZW1lbnQoY29u
c3QgV2ViQ29yZTo6RWxlbWVudCogZWxlbQogCiB2b2lkIENocm9tZUNsaWVudEltcGw6OmVudGVy
RnVsbFNjcmVlbkZvckVsZW1lbnQoV2ViQ29yZTo6RWxlbWVudCogZWxlbWVudCkKIHsKKyAgICAv
LyBGSVhNRTogTWFrZSB0aGlzIGNvZGUgc3VwcG9ydCBhc3luY2hyb25vdXMgZW1iZWRkZXIgaW1w
bGVtZW50YXRpb25zIG9mCisgICAgLy8gZW50ZXJGdWxsc2NyZWVuRm9yRWxlbWVudCgpIGJ5IHJl
c3RydWN0dXJpbmcgdGhpcyBjb2RlIHRvIHdhaXQgZm9yIGFuCisgICAgLy8gQUNLLgogICAgIC8v
IEZJWE1FOiBXZSBtYXkgbmVlZCB0byBjYWxsIHRoZXNlIHNvbWVwbGFjZSBlbHNlIHdoZW4gd2lu
ZG93IHJlc2l6ZXMuCiAgICAgZWxlbWVudC0+ZG9jdW1lbnQoKS0+d2Via2l0V2lsbEVudGVyRnVs
bFNjcmVlbkZvckVsZW1lbnQoZWxlbWVudCk7CisgICAgbV93ZWJWaWV3LT5jbGllbnQoKS0+ZW50
ZXJGdWxsc2NyZWVuRm9yRWxlbWVudCgpOwogICAgIGVsZW1lbnQtPmRvY3VtZW50KCktPndlYmtp
dERpZEVudGVyRnVsbFNjcmVlbkZvckVsZW1lbnQoZWxlbWVudCk7CiB9CiAKQEAgLTkxOSw2ICs5
MjMsNyBAQCB2b2lkIENocm9tZUNsaWVudEltcGw6OmV4aXRGdWxsU2NyZWVuRm9yRWxlbWVudChX
ZWJDb3JlOjpFbGVtZW50KiBlbGVtZW50KQogewogICAgIC8vIEZJWE1FOiBXZSBtYXkgbmVlZCB0
byBjYWxsIHRoZXNlIHNvbWVwbGFjZSBlbHNlIHdoZW4gd2luZG93IHJlc2l6ZXMuCiAgICAgZWxl
bWVudC0+ZG9jdW1lbnQoKS0+d2Via2l0V2lsbEV4aXRGdWxsU2NyZWVuRm9yRWxlbWVudChlbGVt
ZW50KTsKKyAgICBtX3dlYlZpZXctPmNsaWVudCgpLT5leGl0RnVsbHNjcmVlbkZvckVsZW1lbnQo
KTsKICAgICBlbGVtZW50LT5kb2N1bWVudCgpLT53ZWJraXREaWRFeGl0RnVsbFNjcmVlbkZvckVs
ZW1lbnQoZWxlbWVudCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v
c3JjL1dlYlZpZXdJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJ
bXBsLmNwcAppbmRleCBhNWFjODBkZmYyNDhmOGJlMjUwYWQwNzQyZDdiNzg2YzA0YzdmYTAxLi4z
YTFlNmI4ZWIzYmQwMGZhYWNhZTc1NjYyMTRkZTk4NGU4NDE4NjBkIDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktp
dC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCkBAIC0yNjc1LDQgKzI2NzUsMTYgQEAgdm9p
ZCBXZWJWaWV3SW1wbDo6c2V0VmlzaWJpbGl0eVN0YXRlKFdlYlBhZ2VWaXNpYmlsaXR5U3RhdGUg
dmlzaWJpbGl0eVN0YXRlLAogI2VuZGlmCiB9CiAKK3ZvaWQgV2ViVmlld0ltcGw6OmV4aXRGdWxs
c2NyZWVuKCkKK3sKKyNpZiBFTkFCTEUoRlVMTFNDUkVFTl9BUEkpCisgICAgRG9jdW1lbnQqIGRv
Y3VtZW50ID0gcGFnZSgpLT5tYWluRnJhbWUoKS0+ZG9jdW1lbnQoKTsKKyAgICBFbGVtZW50KiBm
dWxsc2NyZWVuRWxlbWVudCA9IGRvY3VtZW50LT53ZWJraXRDdXJyZW50RnVsbFNjcmVlbkVsZW1l
bnQoKTsKKyAgICBpZiAoIWZ1bGxzY3JlZW5FbGVtZW50KQorICAgICAgICByZXR1cm47CisgICAg
ZG9jdW1lbnQtPndlYmtpdFdpbGxFeGl0RnVsbFNjcmVlbkZvckVsZW1lbnQoZnVsbHNjcmVlbkVs
ZW1lbnQpOworICAgIGRvY3VtZW50LT53ZWJraXREaWRFeGl0RnVsbFNjcmVlbkZvckVsZW1lbnQo
ZnVsbHNjcmVlbkVsZW1lbnQpOworI2VuZGlmCit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaCBiL1Nv
dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKaW5kZXggMjlhNjY4MjkwM2Vm
NTg2OTczOGNjZDYxNjJhMTAzYjhlNWZkYzdiMy4uNmI1OTQzY2FmNmIxYjcxOGYwZmRlYjVjOGNk
YjBhZGExMDhiZWM4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi
Vmlld0ltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5o
CkBAIC0yMDIsNiArMjAyLDcgQEAgcHVibGljOgogICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgdW5zaWduZWQgaW5hY3RpdmVCYWNrZ3JvdW5kQ29sb3IsCiAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpbmFjdGl2ZUZvcmVncm91bmRDb2xvcik7
CiAgICAgdmlydHVhbCB2b2lkIHBlcmZvcm1DdXN0b21Db250ZXh0TWVudUFjdGlvbih1bnNpZ25l
ZCBhY3Rpb24pOworICAgIHZpcnR1YWwgdm9pZCBleGl0RnVsbHNjcmVlbigpOwogCiAgICAgLy8g
Q0NMYXllclRyZWVIb3N0Q2xpZW50CiAgICAgdmlydHVhbCB2b2lkIGFuaW1hdGVBbmRMYXlvdXQo
ZG91YmxlIGZyYW1lQmVnaW5UaW1lKTsK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>104281</attachid>
            <date>2011-08-17 16:39:50 -0700</date>
            <delta_ts>2011-08-17 20:35:56 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-66031-20110818093948.patch</filename>
            <type>text/plain</type>
            <size>5193</size>
            <attacher name="James Kozianski">koz</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogOTEyNjEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy
b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg
MTFiMmRlMDgwNGU4ODg4YWI0MzU5NTE1YTlhMDU1YWVlMjQwZDZiMy4uYmNlNzg5OGQ5OTllMGMz
NzdhOWJiYTYyZmRlMzk4MmQ3M2Y2NDg4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv
bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg
LTEsMyArMSwyMSBAQAorMjAxMS0wOC0xMCAgSmFtZXMgS296aWFuc2tpICA8a296QGNocm9taXVt
Lm9yZz4KKworICAgICAgICBDaHJvbWl1bSBwbHVtYmluZyBmb3Igd2Via2l0UmVxdWVzdEZ1bGxT
Y3JlZW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2
MDMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBw
dWJsaWMvV2ViVmlldy5oOgorICAgICAgICAqIHB1YmxpYy9XZWJWaWV3Q2xpZW50Lmg6CisgICAg
ICAgIChXZWJLaXQ6OldlYlZpZXdDbGllbnQ6OmVudGVyRnVsbHNjcmVlbkZvckVsZW1lbnQpOgor
ICAgICAgICAoV2ViS2l0OjpXZWJWaWV3Q2xpZW50OjpleGl0RnVsbHNjcmVlbkZvckVsZW1lbnQp
OgorICAgICAgICAqIHNyYy9DaHJvbWVDbGllbnRJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6
Q2hyb21lQ2xpZW50SW1wbDo6ZW50ZXJGdWxsU2NyZWVuRm9yRWxlbWVudCk6CisgICAgICAgIChX
ZWJLaXQ6OkNocm9tZUNsaWVudEltcGw6OmV4aXRGdWxsU2NyZWVuRm9yRWxlbWVudCk6CisgICAg
ICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6
OmV4aXRGdWxsc2NyZWVuKToKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuaDoKKwogMjAxMS0w
Ny0xOSAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBb
Q2hyb21pdW1dIFdlYiBJbnNwZWN0b3I6IGFkZCBzYW5pdHkgdGVzdCBmb3Igc2hhcmVkIHdvcmtl
ciBpbnNwZWN0b3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dl
YlZpZXcuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlZpZXcuaAppbmRleCA5
MTQ4ZDcwM2JhZjlkZDhhNGYwNDhhNjZiMzY5ZTIwMWU1ZWQyOTJjLi4zYWU0NTZmMDhjNDgyMzg5
MTRmYWUzODI5MzJlYzIzNzdmYmUyM2Q4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9t
aXVtL3B1YmxpYy9XZWJWaWV3LmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMv
V2ViVmlldy5oCkBAIC0zNjQsNiArMzY0LDEyIEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQg
c2V0VmlzaWJpbGl0eVN0YXRlKFdlYlBhZ2VWaXNpYmlsaXR5U3RhdGUgdmlzaWJpbGl0eVN0YXRl
LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYm9vbCBpc0luaXRpYWxTdGF0
ZSkgeyB9CiAKKworICAgIC8vIEZ1bGxzY3JlZW4gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KKworICAgIHZpcnR1YWwgdm9pZCBleGl0
RnVsbHNjcmVlbigpID0gMDsKKworCiBwcm90ZWN0ZWQ6CiAgICAgfldlYlZpZXcoKSB7fQogfTsK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlZpZXdDbGllbnQu
aCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlZpZXdDbGllbnQuaAppbmRleCA4
OTk4NmIyZjc4OWQzZjQxZTc2NmUwZGY4ZWIxNGJkMGExNGUwMWFkLi44ZTEwMDRiMDIyZGI0Njgz
ZWUzYTI5YWJjZWFiZDI5OGVjYmNmODM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9t
aXVtL3B1YmxpYy9XZWJWaWV3Q2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9w
dWJsaWMvV2ViVmlld0NsaWVudC5oCkBAIC0yMTUsNiArMjE1LDggQEAgcHVibGljOgogICAgIHZp
cnR1YWwgYm9vbCBzdXBwb3J0c0Z1bGxzY3JlZW4oKSB7IHJldHVybiBmYWxzZTsgfQogICAgIHZp
cnR1YWwgdm9pZCBlbnRlckZ1bGxzY3JlZW5Gb3JOb2RlKGNvbnN0IFdlYk5vZGUmKSB7IH0KICAg
ICB2aXJ0dWFsIHZvaWQgZXhpdEZ1bGxzY3JlZW5Gb3JOb2RlKGNvbnN0IFdlYk5vZGUmKSB7IH0K
KyAgICB2aXJ0dWFsIHZvaWQgZW50ZXJGdWxsc2NyZWVuKCkgeyB9CisgICAgdmlydHVhbCB2b2lk
IGV4aXRGdWxsc2NyZWVuKCkgeyB9CiAKICAgICAvLyBVSSAtLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIApkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHAgYi9Tb3Vy
Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBsLmNwcAppbmRleCBhM2U5YjBm
ZDkzYmI4YzBlNjM2YTliNmIzMWEzYjE1YTY3ODVjZjhmLi4yNTdkNzMxNjBjMzk5YmRkZjMwZjk3
NDU4Njc2YjkwNmJlMDMxYWQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny
Yy9DaHJvbWVDbGllbnRJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9D
aHJvbWVDbGllbnRJbXBsLmNwcApAQCAtOTEwLDggKzkxMCwxMiBAQCBib29sIENocm9tZUNsaWVu
dEltcGw6OnN1cHBvcnRzRnVsbFNjcmVlbkZvckVsZW1lbnQoY29uc3QgV2ViQ29yZTo6RWxlbWVu
dCogZWxlbQogCiB2b2lkIENocm9tZUNsaWVudEltcGw6OmVudGVyRnVsbFNjcmVlbkZvckVsZW1l
bnQoV2ViQ29yZTo6RWxlbWVudCogZWxlbWVudCkKIHsKKyAgICAvLyBGSVhNRTogTWFrZSB0aGlz
IGNvZGUgc3VwcG9ydCBhc3luY2hyb25vdXMgZW1iZWRkZXIgaW1wbGVtZW50YXRpb25zIG9mCisg
ICAgLy8gZW50ZXJGdWxsc2NyZWVuRm9yRWxlbWVudCgpIGJ5IHJlc3RydWN0dXJpbmcgdGhpcyBj
b2RlIHRvIHdhaXQgZm9yIGFuCisgICAgLy8gQUNLLgogICAgIC8vIEZJWE1FOiBXZSBtYXkgbmVl
ZCB0byBjYWxsIHRoZXNlIHNvbWVwbGFjZSBlbHNlIHdoZW4gd2luZG93IHJlc2l6ZXMuCiAgICAg
ZWxlbWVudC0+ZG9jdW1lbnQoKS0+d2Via2l0V2lsbEVudGVyRnVsbFNjcmVlbkZvckVsZW1lbnQo
ZWxlbWVudCk7CisgICAgbV93ZWJWaWV3LT5jbGllbnQoKS0+ZW50ZXJGdWxsc2NyZWVuRm9yRWxl
bWVudCgpOwogICAgIGVsZW1lbnQtPmRvY3VtZW50KCktPndlYmtpdERpZEVudGVyRnVsbFNjcmVl
bkZvckVsZW1lbnQoZWxlbWVudCk7CiB9CiAKQEAgLTkxOSw2ICs5MjMsNyBAQCB2b2lkIENocm9t
ZUNsaWVudEltcGw6OmV4aXRGdWxsU2NyZWVuRm9yRWxlbWVudChXZWJDb3JlOjpFbGVtZW50KiBl
bGVtZW50KQogewogICAgIC8vIEZJWE1FOiBXZSBtYXkgbmVlZCB0byBjYWxsIHRoZXNlIHNvbWVw
bGFjZSBlbHNlIHdoZW4gd2luZG93IHJlc2l6ZXMuCiAgICAgZWxlbWVudC0+ZG9jdW1lbnQoKS0+
d2Via2l0V2lsbEV4aXRGdWxsU2NyZWVuRm9yRWxlbWVudChlbGVtZW50KTsKKyAgICBtX3dlYlZp
ZXctPmNsaWVudCgpLT5leGl0RnVsbHNjcmVlbkZvckVsZW1lbnQoKTsKICAgICBlbGVtZW50LT5k
b2N1bWVudCgpLT53ZWJraXREaWRFeGl0RnVsbFNjcmVlbkZvckVsZW1lbnQoZWxlbWVudCk7CiB9
CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNw
cCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAppbmRleCBhNWFj
ODBkZmYyNDhmOGJlMjUwYWQwNzQyZDdiNzg2YzA0YzdmYTAxLi4zYTFlNmI4ZWIzYmQwMGZhYWNh
ZTc1NjYyMTRkZTk4NGU4NDE4NjBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt
L3NyYy9XZWJWaWV3SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi
Vmlld0ltcGwuY3BwCkBAIC0yNjc1LDQgKzI2NzUsMTYgQEAgdm9pZCBXZWJWaWV3SW1wbDo6c2V0
VmlzaWJpbGl0eVN0YXRlKFdlYlBhZ2VWaXNpYmlsaXR5U3RhdGUgdmlzaWJpbGl0eVN0YXRlLAog
I2VuZGlmCiB9CiAKK3ZvaWQgV2ViVmlld0ltcGw6OmV4aXRGdWxsc2NyZWVuKCkKK3sKKyNpZiBF
TkFCTEUoRlVMTFNDUkVFTl9BUEkpCisgICAgRG9jdW1lbnQqIGRvY3VtZW50ID0gcGFnZSgpLT5t
YWluRnJhbWUoKS0+ZG9jdW1lbnQoKTsKKyAgICBFbGVtZW50KiBmdWxsc2NyZWVuRWxlbWVudCA9
IGRvY3VtZW50LT53ZWJraXRDdXJyZW50RnVsbFNjcmVlbkVsZW1lbnQoKTsKKyAgICBpZiAoIWZ1
bGxzY3JlZW5FbGVtZW50KQorICAgICAgICByZXR1cm47CisgICAgZG9jdW1lbnQtPndlYmtpdFdp
bGxFeGl0RnVsbFNjcmVlbkZvckVsZW1lbnQoZnVsbHNjcmVlbkVsZW1lbnQpOworICAgIGRvY3Vt
ZW50LT53ZWJraXREaWRFeGl0RnVsbFNjcmVlbkZvckVsZW1lbnQoZnVsbHNjcmVlbkVsZW1lbnQp
OworI2VuZGlmCit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNl
L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21p
dW0vc3JjL1dlYlZpZXdJbXBsLmgKaW5kZXggMjlhNjY4MjkwM2VmNTg2OTczOGNjZDYxNjJhMTAz
YjhlNWZkYzdiMy4uNmI1OTQzY2FmNmIxYjcxOGYwZmRlYjVjOGNkYjBhZGExMDhiZWM4OSAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAorKysgYi9T
b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCkBAIC0yMDIsNiArMjAyLDcg
QEAgcHVibGljOgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQg
aW5hY3RpdmVCYWNrZ3JvdW5kQ29sb3IsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICB1bnNpZ25lZCBpbmFjdGl2ZUZvcmVncm91bmRDb2xvcik7CiAgICAgdmlydHVhbCB2b2lk
IHBlcmZvcm1DdXN0b21Db250ZXh0TWVudUFjdGlvbih1bnNpZ25lZCBhY3Rpb24pOworICAgIHZp
cnR1YWwgdm9pZCBleGl0RnVsbHNjcmVlbigpOwogCiAgICAgLy8gQ0NMYXllclRyZWVIb3N0Q2xp
ZW50CiAgICAgdmlydHVhbCB2b2lkIGFuaW1hdGVBbmRMYXlvdXQoZG91YmxlIGZyYW1lQmVnaW5U
aW1lKTsK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>104301</attachid>
            <date>2011-08-17 20:36:05 -0700</date>
            <delta_ts>2011-08-17 20:48:34 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-66031-20110818133602.patch</filename>
            <type>text/plain</type>
            <size>5173</size>
            <attacher name="James Kozianski">koz</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogOTEyNjEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy
b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg
MTFiMmRlMDgwNGU4ODg4YWI0MzU5NTE1YTlhMDU1YWVlMjQwZDZiMy4uYmNlNzg5OGQ5OTllMGMz
NzdhOWJiYTYyZmRlMzk4MmQ3M2Y2NDg4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv
bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg
LTEsMyArMSwyMSBAQAorMjAxMS0wOC0xMCAgSmFtZXMgS296aWFuc2tpICA8a296QGNocm9taXVt
Lm9yZz4KKworICAgICAgICBDaHJvbWl1bSBwbHVtYmluZyBmb3Igd2Via2l0UmVxdWVzdEZ1bGxT
Y3JlZW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2
MDMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBw
dWJsaWMvV2ViVmlldy5oOgorICAgICAgICAqIHB1YmxpYy9XZWJWaWV3Q2xpZW50Lmg6CisgICAg
ICAgIChXZWJLaXQ6OldlYlZpZXdDbGllbnQ6OmVudGVyRnVsbHNjcmVlbkZvckVsZW1lbnQpOgor
ICAgICAgICAoV2ViS2l0OjpXZWJWaWV3Q2xpZW50OjpleGl0RnVsbHNjcmVlbkZvckVsZW1lbnQp
OgorICAgICAgICAqIHNyYy9DaHJvbWVDbGllbnRJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6
Q2hyb21lQ2xpZW50SW1wbDo6ZW50ZXJGdWxsU2NyZWVuRm9yRWxlbWVudCk6CisgICAgICAgIChX
ZWJLaXQ6OkNocm9tZUNsaWVudEltcGw6OmV4aXRGdWxsU2NyZWVuRm9yRWxlbWVudCk6CisgICAg
ICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6
OmV4aXRGdWxsc2NyZWVuKToKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuaDoKKwogMjAxMS0w
Ny0xOSAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBb
Q2hyb21pdW1dIFdlYiBJbnNwZWN0b3I6IGFkZCBzYW5pdHkgdGVzdCBmb3Igc2hhcmVkIHdvcmtl
ciBpbnNwZWN0b3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dl
YlZpZXcuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlZpZXcuaAppbmRleCA5
MTQ4ZDcwM2JhZjlkZDhhNGYwNDhhNjZiMzY5ZTIwMWU1ZWQyOTJjLi4zYWU0NTZmMDhjNDgyMzg5
MTRmYWUzODI5MzJlYzIzNzdmYmUyM2Q4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9t
aXVtL3B1YmxpYy9XZWJWaWV3LmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMv
V2ViVmlldy5oCkBAIC0zNjQsNiArMzY0LDEyIEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQg
c2V0VmlzaWJpbGl0eVN0YXRlKFdlYlBhZ2VWaXNpYmlsaXR5U3RhdGUgdmlzaWJpbGl0eVN0YXRl
LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYm9vbCBpc0luaXRpYWxTdGF0
ZSkgeyB9CiAKKworICAgIC8vIEZ1bGxzY3JlZW4gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KKworICAgIHZpcnR1YWwgdm9pZCBleGl0
RnVsbHNjcmVlbigpID0gMDsKKworCiBwcm90ZWN0ZWQ6CiAgICAgfldlYlZpZXcoKSB7fQogfTsK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlZpZXdDbGllbnQu
aCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlZpZXdDbGllbnQuaAppbmRleCA4
OTk4NmIyZjc4OWQzZjQxZTc2NmUwZGY4ZWIxNGJkMGExNGUwMWFkLi44ZTEwMDRiMDIyZGI0Njgz
ZWUzYTI5YWJjZWFiZDI5OGVjYmNmODM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9t
aXVtL3B1YmxpYy9XZWJWaWV3Q2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9w
dWJsaWMvV2ViVmlld0NsaWVudC5oCkBAIC0yMTUsNiArMjE1LDggQEAgcHVibGljOgogICAgIHZp
cnR1YWwgYm9vbCBzdXBwb3J0c0Z1bGxzY3JlZW4oKSB7IHJldHVybiBmYWxzZTsgfQogICAgIHZp
cnR1YWwgdm9pZCBlbnRlckZ1bGxzY3JlZW5Gb3JOb2RlKGNvbnN0IFdlYk5vZGUmKSB7IH0KICAg
ICB2aXJ0dWFsIHZvaWQgZXhpdEZ1bGxzY3JlZW5Gb3JOb2RlKGNvbnN0IFdlYk5vZGUmKSB7IH0K
KyAgICB2aXJ0dWFsIHZvaWQgZW50ZXJGdWxsc2NyZWVuKCkgeyB9CisgICAgdmlydHVhbCB2b2lk
IGV4aXRGdWxsc2NyZWVuKCkgeyB9CiAKICAgICAvLyBVSSAtLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIApkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHAgYi9Tb3Vy
Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBsLmNwcAppbmRleCBhM2U5YjBm
ZDkzYmI4YzBlNjM2YTliNmIzMWEzYjE1YTY3ODVjZjhmLi44Nzk1MTQzOWRkODZmZDcwNWViNTY3
NDVmMmM5NDA5ZmFjZWNhMzA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny
Yy9DaHJvbWVDbGllbnRJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9D
aHJvbWVDbGllbnRJbXBsLmNwcApAQCAtOTEwLDggKzkxMCwxMiBAQCBib29sIENocm9tZUNsaWVu
dEltcGw6OnN1cHBvcnRzRnVsbFNjcmVlbkZvckVsZW1lbnQoY29uc3QgV2ViQ29yZTo6RWxlbWVu
dCogZWxlbQogCiB2b2lkIENocm9tZUNsaWVudEltcGw6OmVudGVyRnVsbFNjcmVlbkZvckVsZW1l
bnQoV2ViQ29yZTo6RWxlbWVudCogZWxlbWVudCkKIHsKKyAgICAvLyBGSVhNRTogTWFrZSB0aGlz
IGNvZGUgc3VwcG9ydCBhc3luY2hyb25vdXMgZW1iZWRkZXIgaW1wbGVtZW50YXRpb25zIG9mCisg
ICAgLy8gZW50ZXJGdWxsc2NyZWVuRm9yRWxlbWVudCgpIGJ5IHJlc3RydWN0dXJpbmcgdGhpcyBj
b2RlIHRvIHdhaXQgZm9yIGFuCisgICAgLy8gQUNLLgogICAgIC8vIEZJWE1FOiBXZSBtYXkgbmVl
ZCB0byBjYWxsIHRoZXNlIHNvbWVwbGFjZSBlbHNlIHdoZW4gd2luZG93IHJlc2l6ZXMuCiAgICAg
ZWxlbWVudC0+ZG9jdW1lbnQoKS0+d2Via2l0V2lsbEVudGVyRnVsbFNjcmVlbkZvckVsZW1lbnQo
ZWxlbWVudCk7CisgICAgbV93ZWJWaWV3LT5jbGllbnQoKS0+ZW50ZXJGdWxsc2NyZWVuKCk7CiAg
ICAgZWxlbWVudC0+ZG9jdW1lbnQoKS0+d2Via2l0RGlkRW50ZXJGdWxsU2NyZWVuRm9yRWxlbWVu
dChlbGVtZW50KTsKIH0KIApAQCAtOTE5LDYgKzkyMyw3IEBAIHZvaWQgQ2hyb21lQ2xpZW50SW1w
bDo6ZXhpdEZ1bGxTY3JlZW5Gb3JFbGVtZW50KFdlYkNvcmU6OkVsZW1lbnQqIGVsZW1lbnQpCiB7
CiAgICAgLy8gRklYTUU6IFdlIG1heSBuZWVkIHRvIGNhbGwgdGhlc2Ugc29tZXBsYWNlIGVsc2Ug
d2hlbiB3aW5kb3cgcmVzaXplcy4KICAgICBlbGVtZW50LT5kb2N1bWVudCgpLT53ZWJraXRXaWxs
RXhpdEZ1bGxTY3JlZW5Gb3JFbGVtZW50KGVsZW1lbnQpOworICAgIG1fd2ViVmlldy0+Y2xpZW50
KCktPmV4aXRGdWxsc2NyZWVuKCk7CiAgICAgZWxlbWVudC0+ZG9jdW1lbnQoKS0+d2Via2l0RGlk
RXhpdEZ1bGxTY3JlZW5Gb3JFbGVtZW50KGVsZW1lbnQpOwogfQogCmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2No
cm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKaW5kZXggYTVhYzgwZGZmMjQ4ZjhiZTI1MGFkMDc0
MmQ3Yjc4NmMwNGM3ZmEwMS4uM2ExZTZiOGViM2JkMDBmYWFjYWU3NTY2MjE0ZGU5ODRlODQxODYw
ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3Bw
CisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcApAQCAtMjY3
NSw0ICsyNjc1LDE2IEBAIHZvaWQgV2ViVmlld0ltcGw6OnNldFZpc2liaWxpdHlTdGF0ZShXZWJQ
YWdlVmlzaWJpbGl0eVN0YXRlIHZpc2liaWxpdHlTdGF0ZSwKICNlbmRpZgogfQogCit2b2lkIFdl
YlZpZXdJbXBsOjpleGl0RnVsbHNjcmVlbigpCit7CisjaWYgRU5BQkxFKEZVTExTQ1JFRU5fQVBJ
KQorICAgIERvY3VtZW50KiBkb2N1bWVudCA9IHBhZ2UoKS0+bWFpbkZyYW1lKCktPmRvY3VtZW50
KCk7CisgICAgRWxlbWVudCogZnVsbHNjcmVlbkVsZW1lbnQgPSBkb2N1bWVudC0+d2Via2l0Q3Vy
cmVudEZ1bGxTY3JlZW5FbGVtZW50KCk7CisgICAgaWYgKCFmdWxsc2NyZWVuRWxlbWVudCkKKyAg
ICAgICAgcmV0dXJuOworICAgIGRvY3VtZW50LT53ZWJraXRXaWxsRXhpdEZ1bGxTY3JlZW5Gb3JF
bGVtZW50KGZ1bGxzY3JlZW5FbGVtZW50KTsKKyAgICBkb2N1bWVudC0+d2Via2l0RGlkRXhpdEZ1
bGxTY3JlZW5Gb3JFbGVtZW50KGZ1bGxzY3JlZW5FbGVtZW50KTsKKyNlbmRpZgorfQorCiB9IC8v
IG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj
L1dlYlZpZXdJbXBsLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5o
CmluZGV4IDI5YTY2ODI5MDNlZjU4Njk3MzhjY2Q2MTYyYTEwM2I4ZTVmZGM3YjMuLjZiNTk0M2Nh
ZjZiMWI3MThmMGZkZWI1YzhjZGIwYWRhMTA4YmVjODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL
aXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1
bS9zcmMvV2ViVmlld0ltcGwuaApAQCAtMjAyLDYgKzIwMiw3IEBAIHB1YmxpYzoKICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGluYWN0aXZlQmFja2dyb3VuZENv
bG9yLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgaW5hY3Rp
dmVGb3JlZ3JvdW5kQ29sb3IpOwogICAgIHZpcnR1YWwgdm9pZCBwZXJmb3JtQ3VzdG9tQ29udGV4
dE1lbnVBY3Rpb24odW5zaWduZWQgYWN0aW9uKTsKKyAgICB2aXJ0dWFsIHZvaWQgZXhpdEZ1bGxz
Y3JlZW4oKTsKIAogICAgIC8vIENDTGF5ZXJUcmVlSG9zdENsaWVudAogICAgIHZpcnR1YWwgdm9p
ZCBhbmltYXRlQW5kTGF5b3V0KGRvdWJsZSBmcmFtZUJlZ2luVGltZSk7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>104302</attachid>
            <date>2011-08-17 20:48:42 -0700</date>
            <delta_ts>2011-08-18 17:48:45 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-66031-20110818134840.patch</filename>
            <type>text/plain</type>
            <size>5171</size>
            <attacher name="James Kozianski">koz</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogOTEyNjEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy
b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg
MTFiMmRlMDgwNGU4ODg4YWI0MzU5NTE1YTlhMDU1YWVlMjQwZDZiMy4uMzQ1YTE2Nzg0YzQxYWI4
OTdjOGQ5MWJhNmQ2ZjhkYjllOTFiYTMzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv
bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg
LTEsMyArMSwyMSBAQAorMjAxMS0wOC0xMCAgSmFtZXMgS296aWFuc2tpICA8a296QGNocm9taXVt
Lm9yZz4KKworICAgICAgICBDaHJvbWl1bSBwbHVtYmluZyBmb3Igd2Via2l0UmVxdWVzdEZ1bGxT
Y3JlZW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2
MDMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gRmlzaGVyLgorCisgICAgICAgICogcHVi
bGljL1dlYlZpZXcuaDoKKyAgICAgICAgKiBwdWJsaWMvV2ViVmlld0NsaWVudC5oOgorICAgICAg
ICAoV2ViS2l0OjpXZWJWaWV3Q2xpZW50OjplbnRlckZ1bGxzY3JlZW5Gb3JFbGVtZW50KToKKyAg
ICAgICAgKFdlYktpdDo6V2ViVmlld0NsaWVudDo6ZXhpdEZ1bGxzY3JlZW5Gb3JFbGVtZW50KToK
KyAgICAgICAgKiBzcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkNo
cm9tZUNsaWVudEltcGw6OmVudGVyRnVsbFNjcmVlbkZvckVsZW1lbnQpOgorICAgICAgICAoV2Vi
S2l0OjpDaHJvbWVDbGllbnRJbXBsOjpleGl0RnVsbFNjcmVlbkZvckVsZW1lbnQpOgorICAgICAg
ICAqIHNyYy9XZWJWaWV3SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpl
eGl0RnVsbHNjcmVlbik6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmg6CisKIDIwMTEtMDct
MTkgIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW0No
cm9taXVtXSBXZWIgSW5zcGVjdG9yOiBhZGQgc2FuaXR5IHRlc3QgZm9yIHNoYXJlZCB3b3JrZXIg
aW5zcGVjdG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJW
aWV3LmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3LmgKaW5kZXggOTE0
OGQ3MDNiYWY5ZGQ4YTRmMDQ4YTY2YjM2OWUyMDFlNWVkMjkyYy4uM2FlNDU2ZjA4YzQ4MjM4OTE0
ZmFlMzgyOTMyZWMyMzc3ZmJlMjNkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1
bS9wdWJsaWMvV2ViVmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dl
YlZpZXcuaApAQCAtMzY0LDYgKzM2NCwxMiBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNl
dFZpc2liaWxpdHlTdGF0ZShXZWJQYWdlVmlzaWJpbGl0eVN0YXRlIHZpc2liaWxpdHlTdGF0ZSwK
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgaXNJbml0aWFsU3RhdGUp
IHsgfQogCisKKyAgICAvLyBGdWxsc2NyZWVuIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCisKKyAgICB2aXJ0dWFsIHZvaWQgZXhpdEZ1
bGxzY3JlZW4oKSA9IDA7CisKKwogcHJvdGVjdGVkOgogICAgIH5XZWJWaWV3KCkge30KIH07CmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3Q2xpZW50Lmgg
Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3Q2xpZW50LmgKaW5kZXggODk5
ODZiMmY3ODlkM2Y0MWU3NjZlMGRmOGViMTRiZDBhMTRlMDFhZC4uOGUxMDA0YjAyMmRiNDY4M2Vl
M2EyOWFiY2VhYmQyOThlY2JjZjgzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1
bS9wdWJsaWMvV2ViVmlld0NsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVi
bGljL1dlYlZpZXdDbGllbnQuaApAQCAtMjE1LDYgKzIxNSw4IEBAIHB1YmxpYzoKICAgICB2aXJ0
dWFsIGJvb2wgc3VwcG9ydHNGdWxsc2NyZWVuKCkgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0
dWFsIHZvaWQgZW50ZXJGdWxsc2NyZWVuRm9yTm9kZShjb25zdCBXZWJOb2RlJikgeyB9CiAgICAg
dmlydHVhbCB2b2lkIGV4aXRGdWxsc2NyZWVuRm9yTm9kZShjb25zdCBXZWJOb2RlJikgeyB9Cisg
ICAgdmlydHVhbCB2b2lkIGVudGVyRnVsbHNjcmVlbigpIHsgfQorICAgIHZpcnR1YWwgdm9pZCBl
eGl0RnVsbHNjcmVlbigpIHsgfQogCiAgICAgLy8gVUkgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwIGIvU291cmNl
L1dlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHAKaW5kZXggYTNlOWIwZmQ5
M2JiOGMwZTYzNmE5YjZiMzFhM2IxNWE2Nzg1Y2Y4Zi4uODc5NTE0MzlkZDg2ZmQ3MDVlYjU2NzQ1
ZjJjOTQwOWZhY2VjYTMwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv
Q2hyb21lQ2xpZW50SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvQ2hy
b21lQ2xpZW50SW1wbC5jcHAKQEAgLTkxMCw4ICs5MTAsMTIgQEAgYm9vbCBDaHJvbWVDbGllbnRJ
bXBsOjpzdXBwb3J0c0Z1bGxTY3JlZW5Gb3JFbGVtZW50KGNvbnN0IFdlYkNvcmU6OkVsZW1lbnQq
IGVsZW0KIAogdm9pZCBDaHJvbWVDbGllbnRJbXBsOjplbnRlckZ1bGxTY3JlZW5Gb3JFbGVtZW50
KFdlYkNvcmU6OkVsZW1lbnQqIGVsZW1lbnQpCiB7CisgICAgLy8gRklYTUU6IE1ha2UgdGhpcyBj
b2RlIHN1cHBvcnQgYXN5bmNocm9ub3VzIGVtYmVkZGVyIGltcGxlbWVudGF0aW9ucyBvZgorICAg
IC8vIGVudGVyRnVsbHNjcmVlbkZvckVsZW1lbnQoKSBieSByZXN0cnVjdHVyaW5nIHRoaXMgY29k
ZSB0byB3YWl0IGZvciBhbgorICAgIC8vIEFDSy4KICAgICAvLyBGSVhNRTogV2UgbWF5IG5lZWQg
dG8gY2FsbCB0aGVzZSBzb21lcGxhY2UgZWxzZSB3aGVuIHdpbmRvdyByZXNpemVzLgogICAgIGVs
ZW1lbnQtPmRvY3VtZW50KCktPndlYmtpdFdpbGxFbnRlckZ1bGxTY3JlZW5Gb3JFbGVtZW50KGVs
ZW1lbnQpOworICAgIG1fd2ViVmlldy0+Y2xpZW50KCktPmVudGVyRnVsbHNjcmVlbigpOwogICAg
IGVsZW1lbnQtPmRvY3VtZW50KCktPndlYmtpdERpZEVudGVyRnVsbFNjcmVlbkZvckVsZW1lbnQo
ZWxlbWVudCk7CiB9CiAKQEAgLTkxOSw2ICs5MjMsNyBAQCB2b2lkIENocm9tZUNsaWVudEltcGw6
OmV4aXRGdWxsU2NyZWVuRm9yRWxlbWVudChXZWJDb3JlOjpFbGVtZW50KiBlbGVtZW50KQogewog
ICAgIC8vIEZJWE1FOiBXZSBtYXkgbmVlZCB0byBjYWxsIHRoZXNlIHNvbWVwbGFjZSBlbHNlIHdo
ZW4gd2luZG93IHJlc2l6ZXMuCiAgICAgZWxlbWVudC0+ZG9jdW1lbnQoKS0+d2Via2l0V2lsbEV4
aXRGdWxsU2NyZWVuRm9yRWxlbWVudChlbGVtZW50KTsKKyAgICBtX3dlYlZpZXctPmNsaWVudCgp
LT5leGl0RnVsbHNjcmVlbigpOwogICAgIGVsZW1lbnQtPmRvY3VtZW50KCktPndlYmtpdERpZEV4
aXRGdWxsU2NyZWVuRm9yRWxlbWVudChlbGVtZW50KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl
L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJv
bWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCmluZGV4IGE1YWM4MGRmZjI0OGY4YmUyNTBhZDA3NDJk
N2I3ODZjMDRjN2ZhMDEuLjNhMWU2YjhlYjNiZDAwZmFhY2FlNzU2NjIxNGRlOTg0ZTg0MTg2MGQg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAor
KysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTI2NzUs
NCArMjY3NSwxNiBAQCB2b2lkIFdlYlZpZXdJbXBsOjpzZXRWaXNpYmlsaXR5U3RhdGUoV2ViUGFn
ZVZpc2liaWxpdHlTdGF0ZSB2aXNpYmlsaXR5U3RhdGUsCiAjZW5kaWYKIH0KIAordm9pZCBXZWJW
aWV3SW1wbDo6ZXhpdEZ1bGxzY3JlZW4oKQoreworI2lmIEVOQUJMRShGVUxMU0NSRUVOX0FQSSkK
KyAgICBEb2N1bWVudCogZG9jdW1lbnQgPSBwYWdlKCktPm1haW5GcmFtZSgpLT5kb2N1bWVudCgp
OworICAgIEVsZW1lbnQqIGZ1bGxzY3JlZW5FbGVtZW50ID0gZG9jdW1lbnQtPndlYmtpdEN1cnJl
bnRGdWxsU2NyZWVuRWxlbWVudCgpOworICAgIGlmICghZnVsbHNjcmVlbkVsZW1lbnQpCisgICAg
ICAgIHJldHVybjsKKyAgICBkb2N1bWVudC0+d2Via2l0V2lsbEV4aXRGdWxsU2NyZWVuRm9yRWxl
bWVudChmdWxsc2NyZWVuRWxlbWVudCk7CisgICAgZG9jdW1lbnQtPndlYmtpdERpZEV4aXRGdWxs
U2NyZWVuRm9yRWxlbWVudChmdWxsc2NyZWVuRWxlbWVudCk7CisjZW5kaWYKK30KKwogfSAvLyBu
YW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9X
ZWJWaWV3SW1wbC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaApp
bmRleCAyOWE2NjgyOTAzZWY1ODY5NzM4Y2NkNjE2MmExMDNiOGU1ZmRjN2IzLi42YjU5NDNjYWY2
YjFiNzE4ZjBmZGViNWM4Y2RiMGFkYTEwOGJlYzg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0
L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v
c3JjL1dlYlZpZXdJbXBsLmgKQEAgLTIwMiw2ICsyMDIsNyBAQCBwdWJsaWM6CiAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpbmFjdGl2ZUJhY2tncm91bmRDb2xv
ciwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGluYWN0aXZl
Rm9yZWdyb3VuZENvbG9yKTsKICAgICB2aXJ0dWFsIHZvaWQgcGVyZm9ybUN1c3RvbUNvbnRleHRN
ZW51QWN0aW9uKHVuc2lnbmVkIGFjdGlvbik7CisgICAgdmlydHVhbCB2b2lkIGV4aXRGdWxsc2Ny
ZWVuKCk7CiAKICAgICAvLyBDQ0xheWVyVHJlZUhvc3RDbGllbnQKICAgICB2aXJ0dWFsIHZvaWQg
YW5pbWF0ZUFuZExheW91dChkb3VibGUgZnJhbWVCZWdpblRpbWUpOwo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>104429</attachid>
            <date>2011-08-18 17:48:53 -0700</date>
            <delta_ts>2011-08-18 18:17:35 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-66031-20110819104850.patch</filename>
            <type>text/plain</type>
            <size>5149</size>
            <attacher name="James Kozianski">koz</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogOTMzNzQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy
b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg
NWNiMTg5NjgyZWNmZTk1NzM3ZTEwMDYzMzBiMzRiZDY1NzIzMDYxMC4uMGFiZmUwYTQ4YWMyNGNi
NmEzMjlmNzhkNDQ1NzAxZGI3MDQxNjI5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv
bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg
LTEsMyArMSwyMSBAQAorMjAxMS0wOC0xMCAgSmFtZXMgS296aWFuc2tpICA8a296QGNocm9taXVt
Lm9yZz4KKworICAgICAgICBDaHJvbWl1bSBwbHVtYmluZyBmb3Igd2Via2l0UmVxdWVzdEZ1bGxT
Y3JlZW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2
MDMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gRmlzaGVyLgorCisgICAgICAgICogcHVi
bGljL1dlYlZpZXcuaDoKKyAgICAgICAgKiBwdWJsaWMvV2ViVmlld0NsaWVudC5oOgorICAgICAg
ICAoV2ViS2l0OjpXZWJWaWV3Q2xpZW50OjplbnRlckZ1bGxzY3JlZW5Gb3JFbGVtZW50KToKKyAg
ICAgICAgKFdlYktpdDo6V2ViVmlld0NsaWVudDo6ZXhpdEZ1bGxzY3JlZW5Gb3JFbGVtZW50KToK
KyAgICAgICAgKiBzcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkNo
cm9tZUNsaWVudEltcGw6OmVudGVyRnVsbFNjcmVlbkZvckVsZW1lbnQpOgorICAgICAgICAoV2Vi
S2l0OjpDaHJvbWVDbGllbnRJbXBsOjpleGl0RnVsbFNjcmVlbkZvckVsZW1lbnQpOgorICAgICAg
ICAqIHNyYy9XZWJWaWV3SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpl
eGl0RnVsbHNjcmVlbik6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmg6CisKIDIwMTEtMDgt
MTggIENocmlzIFJvZ2VycyAgPGNyb2dlcnNAZ29vZ2xlLmNvbT4KIAogICAgICAgICBJbXBsZW1l
bnQgV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsOjphdWRpb1NvdXJjZVByb3ZpZGVyKCkgYW5kIGlu
dGVyZmFjZSBpbnRvIGNocm9taXVtCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt
L3B1YmxpYy9XZWJWaWV3LmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3
LmgKaW5kZXggNTJjOWE2ZGUxOTAzNDRiZTNkNTk5MzQzODA4ZjFjZjk1MDdlOTM5YS4uODljMTMy
NTM4YjNkODBhNTY0NmQ1YWM0OWRiMDJjZDFkNTc1ZjU1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21p
dW0vcHVibGljL1dlYlZpZXcuaApAQCAtMzczLDYgKzM3MywxMiBAQCBwdWJsaWM6CiAgICAgdmly
dHVhbCB2b2lkIHNldFZpc2liaWxpdHlTdGF0ZShXZWJQYWdlVmlzaWJpbGl0eVN0YXRlIHZpc2li
aWxpdHlTdGF0ZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgaXNJ
bml0aWFsU3RhdGUpIHsgfQogCisKKyAgICAvLyBGdWxsc2NyZWVuIC0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCisKKyAgICB2aXJ0dWFs
IHZvaWQgZXhpdEZ1bGxzY3JlZW4oKSA9IDA7CisKKwogcHJvdGVjdGVkOgogICAgIH5XZWJWaWV3
KCkge30KIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJW
aWV3Q2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3Q2xpZW50
LmgKaW5kZXggYzVhN2NmMjk3MTNhY2E1NTlmNmFiNWYzN2VjYWI4MDFjZTVjMWIzYy4uNTJiZmMy
MTU1YTVmYjY3YjgzMjg0MzM5MDAzYzQ5NTk4ZDA3Yjc5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlld0NsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQv
Y2hyb21pdW0vcHVibGljL1dlYlZpZXdDbGllbnQuaApAQCAtMjE1LDYgKzIxNSw4IEBAIHB1Ymxp
YzoKICAgICB2aXJ0dWFsIGJvb2wgc3VwcG9ydHNGdWxsc2NyZWVuKCkgeyByZXR1cm4gZmFsc2U7
IH0KICAgICB2aXJ0dWFsIHZvaWQgZW50ZXJGdWxsc2NyZWVuRm9yTm9kZShjb25zdCBXZWJOb2Rl
JikgeyB9CiAgICAgdmlydHVhbCB2b2lkIGV4aXRGdWxsc2NyZWVuRm9yTm9kZShjb25zdCBXZWJO
b2RlJikgeyB9CisgICAgdmlydHVhbCB2b2lkIGVudGVyRnVsbHNjcmVlbigpIHsgfQorICAgIHZp
cnR1YWwgdm9pZCBleGl0RnVsbHNjcmVlbigpIHsgfQogCiAgICAgLy8gVUkgLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwu
Y3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHAKaW5k
ZXggYmQ3ZDM2MTJjYWIxNGU4ZTdkOTRhMTMxYzMyYThmMmFiZWRmOTAwYS4uMzQ1M2ZmNTRkOGRi
ZDBiZGM3ZDgxNzhhNDg5Nzc1MDIyNDlkZmY3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9j
aHJvbWl1bS9zcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJv
bWl1bS9zcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHAKQEAgLTg5OSw4ICs4OTksMTIgQEAgYm9vbCBD
aHJvbWVDbGllbnRJbXBsOjpzdXBwb3J0c0Z1bGxTY3JlZW5Gb3JFbGVtZW50KGNvbnN0IFdlYkNv
cmU6OkVsZW1lbnQqIGVsZW0KIAogdm9pZCBDaHJvbWVDbGllbnRJbXBsOjplbnRlckZ1bGxTY3Jl
ZW5Gb3JFbGVtZW50KFdlYkNvcmU6OkVsZW1lbnQqIGVsZW1lbnQpCiB7CisgICAgLy8gRklYTUU6
IE1ha2UgdGhpcyBjb2RlIHN1cHBvcnQgYXN5bmNocm9ub3VzIGVtYmVkZGVyIGltcGxlbWVudGF0
aW9ucyBvZgorICAgIC8vIGVudGVyRnVsbHNjcmVlbkZvckVsZW1lbnQoKSBieSByZXN0cnVjdHVy
aW5nIHRoaXMgY29kZSB0byB3YWl0IGZvciBhbgorICAgIC8vIEFDSy4KICAgICAvLyBGSVhNRTog
V2UgbWF5IG5lZWQgdG8gY2FsbCB0aGVzZSBzb21lcGxhY2UgZWxzZSB3aGVuIHdpbmRvdyByZXNp
emVzLgogICAgIGVsZW1lbnQtPmRvY3VtZW50KCktPndlYmtpdFdpbGxFbnRlckZ1bGxTY3JlZW5G
b3JFbGVtZW50KGVsZW1lbnQpOworICAgIG1fd2ViVmlldy0+Y2xpZW50KCktPmVudGVyRnVsbHNj
cmVlbigpOwogICAgIGVsZW1lbnQtPmRvY3VtZW50KCktPndlYmtpdERpZEVudGVyRnVsbFNjcmVl
bkZvckVsZW1lbnQoZWxlbWVudCk7CiB9CiAKQEAgLTkwOCw2ICs5MTIsNyBAQCB2b2lkIENocm9t
ZUNsaWVudEltcGw6OmV4aXRGdWxsU2NyZWVuRm9yRWxlbWVudChXZWJDb3JlOjpFbGVtZW50KiBl
bGVtZW50KQogewogICAgIC8vIEZJWE1FOiBXZSBtYXkgbmVlZCB0byBjYWxsIHRoZXNlIHNvbWVw
bGFjZSBlbHNlIHdoZW4gd2luZG93IHJlc2l6ZXMuCiAgICAgZWxlbWVudC0+ZG9jdW1lbnQoKS0+
d2Via2l0V2lsbEV4aXRGdWxsU2NyZWVuRm9yRWxlbWVudChlbGVtZW50KTsKKyAgICBtX3dlYlZp
ZXctPmNsaWVudCgpLT5leGl0RnVsbHNjcmVlbigpOwogICAgIGVsZW1lbnQtPmRvY3VtZW50KCkt
PndlYmtpdERpZEV4aXRGdWxsU2NyZWVuRm9yRWxlbWVudChlbGVtZW50KTsKIH0KIApkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwIGIvU291cmNl
L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCmluZGV4IGFlNWFjODFiMTIzOTFh
ZjE0NjVmYjViOTM5YTFjNWQ5ODc1YzA4YTkuLjgwMTE1ZGQ2OGE1NTgyYTg3ZGM3MzIyZTIxNGU5
MWYwOGE3N2I3Y2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZp
ZXdJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5j
cHAKQEAgLTI2OTMsNSArMjY5MywxNiBAQCB2b2lkIFdlYlZpZXdJbXBsOjpyZXNldEdlc3R1cmVS
ZWNvZ25pemVyKCkKIH0KICNlbmRpZgogCit2b2lkIFdlYlZpZXdJbXBsOjpleGl0RnVsbHNjcmVl
bigpCit7CisjaWYgRU5BQkxFKEZVTExTQ1JFRU5fQVBJKQorICAgIERvY3VtZW50KiBkb2N1bWVu
dCA9IHBhZ2UoKS0+bWFpbkZyYW1lKCktPmRvY3VtZW50KCk7CisgICAgRWxlbWVudCogZnVsbHNj
cmVlbkVsZW1lbnQgPSBkb2N1bWVudC0+d2Via2l0Q3VycmVudEZ1bGxTY3JlZW5FbGVtZW50KCk7
CisgICAgaWYgKCFmdWxsc2NyZWVuRWxlbWVudCkKKyAgICAgICAgcmV0dXJuOworICAgIGRvY3Vt
ZW50LT53ZWJraXRXaWxsRXhpdEZ1bGxTY3JlZW5Gb3JFbGVtZW50KGZ1bGxzY3JlZW5FbGVtZW50
KTsKKyAgICBkb2N1bWVudC0+d2Via2l0RGlkRXhpdEZ1bGxTY3JlZW5Gb3JFbGVtZW50KGZ1bGxz
Y3JlZW5FbGVtZW50KTsKKyNlbmRpZgorfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmggYi9Tb3VyY2Uv
V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCmluZGV4IDRjYmU5MzIyYTI0MmYyNTIz
NGZjNzI4ODliMWVlMTQyNjRhMTg0NGMuLmM0YjZjNmEwNThkMmFlZWMzMmEwZjdhYzI2NDcwZDNi
YWRkNmY3ZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJ
bXBsLmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaApAQCAt
MjA4LDYgKzIwOCw3IEBAIHB1YmxpYzoKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgIHVuc2lnbmVkIGluYWN0aXZlQmFja2dyb3VuZENvbG9yLAogICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgdW5zaWduZWQgaW5hY3RpdmVGb3JlZ3JvdW5kQ29sb3IpOwogICAg
IHZpcnR1YWwgdm9pZCBwZXJmb3JtQ3VzdG9tQ29udGV4dE1lbnVBY3Rpb24odW5zaWduZWQgYWN0
aW9uKTsKKyAgICB2aXJ0dWFsIHZvaWQgZXhpdEZ1bGxzY3JlZW4oKTsKIAogICAgIC8vIENDTGF5
ZXJUcmVlSG9zdENsaWVudAogICAgIHZpcnR1YWwgdm9pZCBhbmltYXRlQW5kTGF5b3V0KGRvdWJs
ZSBmcmFtZUJlZ2luVGltZSk7Cg==
</data>

          </attachment>
      

    </bug>

</bugzilla>