<?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>91744</bug_id>
          
          <creation_ts>2012-07-19 07:40:00 -0700</creation_ts>
          <short_desc>Web Inspector: minimize number of properties on WebInspector.TimelinePresentationModel.Record</short_desc>
          <delta_ts>2012-07-19 09:12:32 -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>Web Inspector (Deprecated)</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>All</rep_platform>
          <op_sys>All</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="Andrey Kosyakov">caseq</reporter>
          <assigned_to name="Andrey Kosyakov">caseq</assigned_to>
          <cc>apavlov</cc>
    
    <cc>bweinstein</cc>
    
    <cc>joepeck</cc>
    
    <cc>keishi</cc>
    
    <cc>loislo</cc>
    
    <cc>pfeldman</cc>
    
    <cc>pmuellr</cc>
    
    <cc>rik</cc>
    
    <cc>timothy</cc>
    
    <cc>yurys</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>673497</commentid>
    <comment_count>0</comment_count>
    <who name="Andrey Kosyakov">caseq</who>
    <bug_when>2012-07-19 07:40:00 -0700</bug_when>
    <thetext>We create an instance of WebInspector.TimelinePresentationModel.Record for each timeline record. Most of the formatted record&apos;s fields so far are just copies of those on the low-level record. This change replaces those with getters, which reduces amount of space these records occupy nearly twice (11.7M =&gt; 6.77M for records, 9.3M =&gt; 7.3M for numbers).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>673507</commentid>
    <comment_count>1</comment_count>
      <attachid>153263</attachid>
    <who name="Andrey Kosyakov">caseq</who>
    <bug_when>2012-07-19 07:48:49 -0700</bug_when>
    <thetext>Created attachment 153263
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>673529</commentid>
    <comment_count>2</comment_count>
      <attachid>153263</attachid>
    <who name="Pavel Feldman">pfeldman</who>
    <bug_when>2012-07-19 08:27:57 -0700</bug_when>
    <thetext>Comment on attachment 153263
Patch

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

&gt; Source/WebCore/inspector/front-end/TimelinePresentationModel.js:391
&gt; +    this._style = WebInspector.TimelinePresentationModel.recordStyle(record);

This could be done lazily.

&gt; Source/WebCore/inspector/front-end/TimelinePresentationModel.js:517
&gt; +    get category()

Please annotate new members.

&gt; Source/WebCore/inspector/front-end/TimelinePresentationModel.js:519
&gt; +        return this._style.category

Inline _style here.

&gt; Source/WebCore/inspector/front-end/TimelinePresentationModel.js:524
&gt; +        return this.type === WebInspector.TimelineModel.RecordType.TimeStamp ? this._record.data[&quot;message&quot;] : this._style.title;

Inline _style here.

&gt; Source/WebCore/inspector/front-end/TimelinePresentationModel.js:562
&gt; +    get _selfTime()

We never do private getters.

&gt; Source/WebCore/inspector/front-end/TimelinePresentationModel.js:571
&gt; +    },

return null;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>673561</commentid>
    <comment_count>3</comment_count>
    <who name="Andrey Kosyakov">caseq</who>
    <bug_when>2012-07-19 09:12:32 -0700</bug_when>
    <thetext>Committed r123108: &lt;http://trac.webkit.org/changeset/123108&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>153263</attachid>
            <date>2012-07-19 07:48:49 -0700</date>
            <delta_ts>2012-07-19 08:27:56 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-91744-20120719184848.patch</filename>
            <type>text/plain</type>
            <size>8493</size>
            <attacher name="Andrey Kosyakov">caseq</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzMDkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmU1ODQ3Yjc2MjY4ZTZj
MWQzODdlMmI0M2RkNDU0NjkzODJjMGQyYi4uNmI0NmU3YTk5OTFhMmYzMTcxM2ZhOTY2ZmM5NGQ3
YzJiMjRmYWI5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEyLTA3LTE5ICBBbmRy
ZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv
cjogbWluaW1pemUgbnVtYmVyIG9mIHByb3BlcnRpZXMgb24gV2ViSW5zcGVjdG9yLlRpbWVsaW5l
UHJlc2VudGF0aW9uTW9kZWwuUmVjb3JkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn
L3Nob3dfYnVnLmNnaT9pZD05MTc0NAorCisgICAgICAgIC0gcmVwbGFjZSBtb3N0IHByb3BlcnRp
ZXMgb24gVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5SZWNvcmQgd2l0aCBnZXR0ZXJzOworCisg
ICAgICAgIFRoaXMgcmVkdWNlcyB0aGUgYW1vdW50IG9mIG1lbW9yeSB3ZSB1c2UgZm9yIHRpbWVs
aW5lIHByZXNlbnRhdGlvbiBtb2RlbCByZWNvcmRzIGFsbW9zdCBieSAyeC4KKworICAgICAgICAq
IGluc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5qczoKKyAgICAg
ICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVByZXNlbnRhdGlvbk1vZGVsLlJlY29yZCk6CisgICAg
ICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5SZWNvcmQucHJvdG90
eXBlLmdldCBjaGlsZHJlbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50
YXRpb25Nb2RlbC5SZWNvcmQucHJvdG90eXBlLmdldCBjYXRlZ29yeSk6CisgICAgICAgIChXZWJJ
bnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5SZWNvcmQucHJvdG90eXBlLmdldCB0
aXRsZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5S
ZWNvcmQucHJvdG90eXBlLmdldCBzdGFydFRpbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRp
bWVsaW5lUHJlc2VudGF0aW9uTW9kZWwuUmVjb3JkLnByb3RvdHlwZS5nZXQgZGF0YSk6CisgICAg
ICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5SZWNvcmQucHJvdG90
eXBlLmdldCB0eXBlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVByZXNlbnRhdGlv
bk1vZGVsLlJlY29yZC5wcm90b3R5cGUuZ2V0IGZyYW1lSWQpOgorICAgICAgICAoV2ViSW5zcGVj
dG9yLlRpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwuUmVjb3JkLnByb3RvdHlwZS5nZXQgZW5kVGlt
ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5SZWNv
cmQucHJvdG90eXBlLmdldCB0b3RhbEhlYXBTaXplKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5U
aW1lbGluZVByZXNlbnRhdGlvbk1vZGVsLlJlY29yZC5wcm90b3R5cGUuZ2V0IHVzZWRIZWFwU2l6
ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5SZWNv
cmQucHJvdG90eXBlLmdldCBfc2VsZlRpbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVs
aW5lUHJlc2VudGF0aW9uTW9kZWwuUmVjb3JkLnByb3RvdHlwZS5nZXQgc3RhY2tUcmFjZSk6Cisg
ICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5SZWNvcmQucHJv
dG90eXBlLmdlbmVyYXRlUG9wdXBDb250ZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1l
bGluZVByZXNlbnRhdGlvbk1vZGVsLlJlY29yZC5wcm90b3R5cGUuY2FsY3VsYXRlQWdncmVnYXRl
ZFN0YXRzKToKKwogMjAxMi0wNy0xOSAgUGV0ZXIgUnliaW4gIDxwZXRlci5yeWJpbkBnbWFpbC5j
b20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogQ29kZUdlbmVyYXRvckluc3BlY3Rvci5weTog
Zml4IG91dHB1dCB3cml0ZSBsb2dpYyB0byBzdXBwb3J0IGluY3JlbWVudGFsIGJ1aWxkCmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUHJlc2Vu
dGF0aW9uTW9kZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVs
aW5lUHJlc2VudGF0aW9uTW9kZWwuanMKaW5kZXggODUwNzkxZjkyZTBlOWFlM2JlMWE1MDgzZGFj
NTQ4ZjVhNjA2MzYzMS4uNjYxNDZhMjZhMzBmM2M4OGUxOGRkYzkzYjJkMzFmZWI5YWE0NWYzZSAx
MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBy
ZXNlbnRhdGlvbk1vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l
bmQvVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5qcwpAQCAtMzg1LDMxICszODUsMTggQEAgV2Vi
SW5zcGVjdG9yLlRpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlLl9fcHJvdG9fXyA9
IFdlYkluc3BlY3Rvci5PYmplY3QKICAqLwogV2ViSW5zcGVjdG9yLlRpbWVsaW5lUHJlc2VudGF0
aW9uTW9kZWwuUmVjb3JkID0gZnVuY3Rpb24ocHJlc2VudGF0aW9uTW9kZWwsIHJlY29yZCwgcGFy
ZW50UmVjb3JkLCBzY3JpcHREZXRhaWxzKQogewotICAgIHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVs
ID0gcHJlc2VudGF0aW9uTW9kZWw7Ci0gICAgdGhpcy5fbGlua2lmaWVyID0gdGhpcy5fcHJlc2Vu
dGF0aW9uTW9kZWwuX2xpbmtpZmllcjsKKyAgICB0aGlzLl9saW5raWZpZXIgPSBwcmVzZW50YXRp
b25Nb2RlbC5fbGlua2lmaWVyOwogICAgIHRoaXMuX2FnZ3JlZ2F0ZWRTdGF0cyA9IFtdOwotICAg
IHZhciByZWNvcmRUeXBlcyA9IFdlYkluc3BlY3Rvci5UaW1lbGluZU1vZGVsLlJlY29yZFR5cGU7
Ci0gICAgdmFyIHN0eWxlID0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwu
cmVjb3JkU3R5bGUocmVjb3JkKTsKKyAgICB0aGlzLl9yZWNvcmQgPSByZWNvcmQ7CisgICAgdGhp
cy5fc3R5bGUgPSBXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5yZWNvcmRT
dHlsZShyZWNvcmQpOworICAgIHRoaXMuX2NoaWxkcmVuID0gW107CiAgICAgdGhpcy5wYXJlbnQg
PSBwYXJlbnRSZWNvcmQ7CiAgICAgaWYgKHBhcmVudFJlY29yZCkKICAgICAgICAgcGFyZW50UmVj
b3JkLmNoaWxkcmVuLnB1c2godGhpcyk7Ci0gICAgdGhpcy5jYXRlZ29yeSA9IHN0eWxlLmNhdGVn
b3J5OwotICAgIHRoaXMudGl0bGUgPSByZWNvcmQudHlwZSA9PT0gcmVjb3JkVHlwZXMuVGltZVN0
YW1wID8gcmVjb3JkLmRhdGFbIm1lc3NhZ2UiXSA6IHN0eWxlLnRpdGxlOwotICAgIHRoaXMuc3Rh
cnRUaW1lID0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lTW9kZWwuc3RhcnRUaW1lSW5TZWNvbmRzKHJl
Y29yZCk7Ci0gICAgdGhpcy5kYXRhID0gcmVjb3JkLmRhdGE7Ci0gICAgdGhpcy50eXBlID0gcmVj
b3JkLnR5cGU7Ci0gICAgdGhpcy5mcmFtZUlkID0gcmVjb3JkLmZyYW1lSWQ7Ci0gICAgdGhpcy5l
bmRUaW1lID0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lTW9kZWwuZW5kVGltZUluU2Vjb25kcyhyZWNv
cmQpOwotICAgIHRoaXMuX3NlbGZUaW1lID0gdGhpcy5lbmRUaW1lIC0gdGhpcy5zdGFydFRpbWU7
CisKICAgICB0aGlzLl9sYXN0Q2hpbGRFbmRUaW1lID0gdGhpcy5lbmRUaW1lOwotICAgIHRoaXMu
X2luaXRpYXRvck9mZnNldCA9IChwYXJlbnRSZWNvcmQgJiYgcGFyZW50UmVjb3JkICE9PSBwcmVz
ZW50YXRpb25Nb2RlbC5fcm9vdFJlY29yZCkgPwotICAgICAgICBwYXJlbnRSZWNvcmQuX2luaXRp
YXRvck9mZnNldCArIHRoaXMuc3RhcnRUaW1lIC0gcGFyZW50UmVjb3JkLnN0YXJ0VGltZSA6IDA7
CiAgICAgdGhpcy5fc3RhcnRUaW1lT2Zmc2V0ID0gdGhpcy5zdGFydFRpbWUgLSBwcmVzZW50YXRp
b25Nb2RlbC5fbWluaW11bVJlY29yZFRpbWU7CiAKLSAgICBpZiAocmVjb3JkLnN0YWNrVHJhY2Ug
JiYgcmVjb3JkLnN0YWNrVHJhY2UubGVuZ3RoKQotICAgICAgICB0aGlzLnN0YWNrVHJhY2UgPSBy
ZWNvcmQuc3RhY2tUcmFjZTsKLSAgICB0aGlzLnRvdGFsSGVhcFNpemUgPSByZWNvcmQudG90YWxI
ZWFwU2l6ZTsKLSAgICB0aGlzLnVzZWRIZWFwU2l6ZSA9IHJlY29yZC51c2VkSGVhcFNpemU7CiAg
ICAgaWYgKHJlY29yZC5kYXRhICYmIHJlY29yZC5kYXRhWyJ1cmwiXSkKICAgICAgICAgdGhpcy51
cmwgPSByZWNvcmQuZGF0YVsidXJsIl07CiAgICAgaWYgKHNjcmlwdERldGFpbHMpIHsKQEAgLTQx
Nyw2ICs0MDQsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5SZWNv
cmQgPSBmdW5jdGlvbihwcmVzZW50YXRpb25Nb2RlbCwgcmVjbwogICAgICAgICB0aGlzLnNjcmlw
dExpbmUgPSBzY3JpcHREZXRhaWxzLnNjcmlwdExpbmU7CiAgICAgfQogCisgICAgdmFyIHJlY29y
ZFR5cGVzID0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lTW9kZWwuUmVjb3JkVHlwZTsKICAgICBzd2l0
Y2ggKHJlY29yZC50eXBlKSB7CiAgICAgY2FzZSByZWNvcmRUeXBlcy5SZXNvdXJjZVNlbmRSZXF1
ZXN0OgogICAgICAgICAvLyBNYWtlIHJlc291cmNlIHJlY2VpdmUgcmVjb3JkIGxhc3Qgc2luY2Ug
cmVxdWVzdCB3YXMgc2VudDsgbWFrZSBmaW5pc2ggcmVjb3JkIGxhc3Qgc2luY2UgcmVzcG9uc2Ug
cmVjZWl2ZWQuCkBAIC00ODMsNyArNDcxLDYgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUHJlc2Vu
dGF0aW9uTW9kZWwuUmVjb3JkID0gZnVuY3Rpb24ocHJlc2VudGF0aW9uTW9kZWwsIHJlY28KICAg
ICAgICAgfQogICAgICAgICBicmVhazsKICAgICB9Ci0gICAgdGhpcy5fcmVmcmVzaERldGFpbHMo
KTsKIH0KIAogV2ViSW5zcGVjdG9yLlRpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwuUmVjb3JkLnBy
b3RvdHlwZSA9IHsKQEAgLTUwMiwxMSArNDg5LDYgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUHJl
c2VudGF0aW9uTW9kZWwuUmVjb3JkLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRoaXMu
X3NlbGZUaW1lOwogICAgIH0sCiAKLSAgICBzZXQgc2VsZlRpbWUodGltZSkKLSAgICB7Ci0gICAg
ICAgIHRoaXMuX3NlbGZUaW1lID0gdGltZTsKLSAgICB9LAotCiAgICAgZ2V0IGNwdVRpbWUoKQog
ICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX2NwdVRpbWU7CkBAIC01MTksOCArNTAxLDYgQEAg
V2ViSW5zcGVjdG9yLlRpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwuUmVjb3JkLnByb3RvdHlwZSA9
IHsKIAogICAgIGdldCBjaGlsZHJlbigpCiAgICAgewotICAgICAgICBpZiAoIXRoaXMuX2NoaWxk
cmVuKQotICAgICAgICAgICAgdGhpcy5fY2hpbGRyZW4gPSBbXTsKICAgICAgICAgcmV0dXJuIHRo
aXMuX2NoaWxkcmVuOwogICAgIH0sCiAKQEAgLTUzNCw2ICs1MTQsNjIgQEAgV2ViSW5zcGVjdG9y
LlRpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwuUmVjb3JkLnByb3RvdHlwZSA9IHsKICAgICAgICAg
cmV0dXJuIHRoaXMuX2ludmlzaWJsZUNoaWxkcmVuQ291bnQgfHwgMDsKICAgICB9LAogCisgICAg
Z2V0IGNhdGVnb3J5KCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9zdHlsZS5jYXRlZ29y
eQorICAgIH0sCisKKyAgICBnZXQgdGl0bGUoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMu
dHlwZSA9PT0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lTW9kZWwuUmVjb3JkVHlwZS5UaW1lU3RhbXAg
PyB0aGlzLl9yZWNvcmQuZGF0YVsibWVzc2FnZSJdIDogdGhpcy5fc3R5bGUudGl0bGU7CisgICAg
fSwKKworICAgIGdldCBzdGFydFRpbWUoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIFdlYkluc3Bl
Y3Rvci5UaW1lbGluZU1vZGVsLnN0YXJ0VGltZUluU2Vjb25kcyh0aGlzLl9yZWNvcmQpOworICAg
IH0sCisKKyAgICBnZXQgZGF0YSgpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fcmVjb3Jk
LmRhdGE7CisgICAgfSwKKworICAgIGdldCB0eXBlKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0
aGlzLl9yZWNvcmQudHlwZTsKKyAgICB9LAorCisgICAgZ2V0IGZyYW1lSWQoKQorICAgIHsKKyAg
ICAgICAgcmV0dXJuIHRoaXMuX3JlY29yZC5mcmFtZUlkOworICAgIH0sCisKKyAgICBnZXQgZW5k
VGltZSgpCisgICAgeworICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlRpbWVsaW5lTW9kZWwu
ZW5kVGltZUluU2Vjb25kcyh0aGlzLl9yZWNvcmQpOworICAgIH0sCisKKyAgICBnZXQgdG90YWxI
ZWFwU2l6ZSgpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fcmVjb3JkLnRvdGFsSGVhcFNp
emU7CisgICAgfSwKKworICAgIGdldCB1c2VkSGVhcFNpemUoKQorICAgIHsKKyAgICAgICAgcmV0
dXJuIHRoaXMuX3JlY29yZC51c2VkSGVhcFNpemU7CisgICAgfSwKKworICAgIGdldCBfc2VsZlRp
bWUoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuZW5kVGltZSAtIHRoaXMuc3RhcnRUaW1l
OworICAgIH0sCisKKyAgICBnZXQgc3RhY2tUcmFjZSgpCisgICAgeworICAgICAgICBpZiAodGhp
cy5fcmVjb3JkLnN0YWNrVHJhY2UgJiYgdGhpcy5fcmVjb3JkLnN0YWNrVHJhY2UubGVuZ3RoKQor
ICAgICAgICAgICAgcmV0dXJuIHRoaXMuX3JlY29yZC5zdGFja1RyYWNlOworICAgIH0sCisKICAg
ICBjb250YWluc1RpbWU6IGZ1bmN0aW9uKHRpbWUpCiAgICAgewogICAgICAgICByZXR1cm4gdGhp
cy5zdGFydFRpbWUgPD0gdGltZSAmJiB0aW1lIDw9IHRoaXMuZW5kVGltZTsKQEAgLTU0Nyw3ICs1
ODMsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5SZWNvcmQucHJv
dG90eXBlID0gewogICAgICAgICAgICAgTnVtYmVyLnNlY29uZHNUb1N0cmluZyh0aGlzLl9zdGFy
dFRpbWVPZmZzZXQpKTsKICAgICAgICAgY29udGVudEhlbHBlci5fYXBwZW5kVGV4dFJvdyhXZWJJ
bnNwZWN0b3IuVUlTdHJpbmcoIkR1cmF0aW9uIiksIHRleHQpOwogCi0gICAgICAgIGlmICh0aGlz
Ll9jaGlsZHJlbiAmJiB0aGlzLl9jaGlsZHJlbi5sZW5ndGgpIHsKKyAgICAgICAgaWYgKHRoaXMu
X2NoaWxkcmVuLmxlbmd0aCkgewogICAgICAgICAgICAgY29udGVudEhlbHBlci5fYXBwZW5kVGV4
dFJvdyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNlbGYgVGltZSIpLCBOdW1iZXIuc2Vjb25kc1Rv
U3RyaW5nKHRoaXMuX3NlbGZUaW1lLCB0cnVlKSk7CiAgICAgICAgICAgICBjb250ZW50SGVscGVy
Ll9hcHBlbmRUZXh0Um93KFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ1BVIFRpbWUiKSwgTnVtYmVy
LnNlY29uZHNUb1N0cmluZyh0aGlzLl9jcHVUaW1lLCB0cnVlKSk7CiAgICAgICAgICAgICBjb250
ZW50SGVscGVyLl9hcHBlbmRFbGVtZW50Um93KFdlYkluc3BlY3Rvci5VSVN0cmluZygiQWdncmVn
YXRlZCBUaW1lIiksCkBAIC03MjIsMTUgKzc1OCwxMyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQ
cmVzZW50YXRpb25Nb2RlbC5SZWNvcmQucHJvdG90eXBlID0gewogICAgICAgICAgICAgdGhpcy5f
YWdncmVnYXRlZFN0YXRzW2NhdGVnb3J5XSA9IDA7CiAgICAgICAgIHRoaXMuX2NwdVRpbWUgPSB0
aGlzLl9zZWxmVGltZTsKIAotICAgICAgICBpZiAodGhpcy5fY2hpbGRyZW4pIHsKLSAgICAgICAg
ICAgIGZvciAodmFyIGluZGV4ID0gdGhpcy5fY2hpbGRyZW4ubGVuZ3RoOyBpbmRleDsgLS1pbmRl
eCkgewotICAgICAgICAgICAgICAgIHZhciBjaGlsZCA9IHRoaXMuX2NoaWxkcmVuW2luZGV4IC0g
MV07Ci0gICAgICAgICAgICAgICAgZm9yICh2YXIgY2F0ZWdvcnkgaW4gY2F0ZWdvcmllcykKLSAg
ICAgICAgICAgICAgICAgICAgdGhpcy5fYWdncmVnYXRlZFN0YXRzW2NhdGVnb3J5XSArPSBjaGls
ZC5fYWdncmVnYXRlZFN0YXRzW2NhdGVnb3J5XTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAg
IGZvciAodmFyIGNhdGVnb3J5IGluIHRoaXMuX2FnZ3JlZ2F0ZWRTdGF0cykKLSAgICAgICAgICAg
ICAgICB0aGlzLl9jcHVUaW1lICs9IHRoaXMuX2FnZ3JlZ2F0ZWRTdGF0c1tjYXRlZ29yeV07Cisg
ICAgICAgIGZvciAodmFyIGluZGV4ID0gdGhpcy5fY2hpbGRyZW4ubGVuZ3RoOyBpbmRleDsgLS1p
bmRleCkgeworICAgICAgICAgICAgdmFyIGNoaWxkID0gdGhpcy5fY2hpbGRyZW5baW5kZXggLSAx
XTsKKyAgICAgICAgICAgIGZvciAodmFyIGNhdGVnb3J5IGluIGNhdGVnb3JpZXMpCisgICAgICAg
ICAgICAgICAgdGhpcy5fYWdncmVnYXRlZFN0YXRzW2NhdGVnb3J5XSArPSBjaGlsZC5fYWdncmVn
YXRlZFN0YXRzW2NhdGVnb3J5XTsKICAgICAgICAgfQorICAgICAgICBmb3IgKHZhciBjYXRlZ29y
eSBpbiB0aGlzLl9hZ2dyZWdhdGVkU3RhdHMpCisgICAgICAgICAgICB0aGlzLl9jcHVUaW1lICs9
IHRoaXMuX2FnZ3JlZ2F0ZWRTdGF0c1tjYXRlZ29yeV07CiAgICAgICAgIHRoaXMuX2FnZ3JlZ2F0
ZWRTdGF0c1t0aGlzLmNhdGVnb3J5Lm5hbWVdICs9IHRoaXMuX3NlbGZUaW1lOwogICAgIH0sCiAK
</data>
<flag name="review"
          id="162175"
          type_id="1"
          status="+"
          setter="pfeldman"
    />
          </attachment>
      

    </bug>

</bugzilla>