<?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>43450</bug_id>
          
          <creation_ts>2010-08-03 17:05:45 -0700</creation_ts>
          <short_desc>Web Inspector: Remove &quot;Online/Offline&quot; icon for Chrome&apos;s appcache devtools UI.</short_desc>
          <delta_ts>2010-08-06 06:30:21 -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>0</everconfirmed>
          <reporter name="Kavita Kanetkar">kkanetkar</reporter>
          <assigned_to name="Nobody">webkit-unassigned</assigned_to>
          <cc>bweinstein</cc>
    
    <cc>commit-queue</cc>
    
    <cc>joepeck</cc>
    
    <cc>keishi</cc>
    
    <cc>michaeln</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>259755</commentid>
    <comment_count>0</comment_count>
    <who name="Kavita Kanetkar">kkanetkar</who>
    <bug_when>2010-08-03 17:05:45 -0700</bug_when>
    <thetext>It always shows &quot;Online&quot; which is not correct. Disabling it for now (via devtools Preferences).
I am not sure if we want want it even. In that case what&apos;s the best way of going about it?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>259764</commentid>
    <comment_count>1</comment_count>
    <who name="Joseph Pecoraro">joepeck</who>
    <bug_when>2010-08-03 17:24:35 -0700</bug_when>
    <thetext>What do you mean by &quot;which is not correct.&quot; This Online/Offline indicator
corresponds to the navigator.onLine value. It is the network connectivity
of the machine.

Is it not switching correctly, or is its value ambiguous (users might think
it means &quot;Using the Application Cache&quot; or &quot;Not Using the Application Cache&quot;?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>260155</commentid>
    <comment_count>2</comment_count>
      <attachid>63480</attachid>
    <who name="Kavita Kanetkar">kkanetkar</who>
    <bug_when>2010-08-04 12:38:56 -0700</bug_when>
    <thetext>Created attachment 63480
patch

From what I understand, we always returns true for navigator.onLine. I am disabling UI for chrome-only. It probably is confusing to end-users to see it always &quot;Online&quot;. Please take a look at the patch.

Thanks!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>260182</commentid>
    <comment_count>3</comment_count>
      <attachid>63480</attachid>
    <who name="Joseph Pecoraro">joepeck</who>
    <bug_when>2010-08-04 13:21:07 -0700</bug_when>
    <thetext>Comment on attachment 63480
patch

(In reply to comment #2)
&gt; From what I understand, we always returns true for navigator.onLine.
&gt; I am disabling UI for chrome-only. It probably is confusing to end-users
&gt; to see it always &quot;Online&quot;. Please take a look at the patch.

Any idea why Chrome always returns true? Is there an open bug
for this feature to be implemented? Can you create a bug or
link me to it?

Finally, can you file a follow up bug to re-enable the feature for
Chrome pending the feature being implemented?

Anyways, the patch looks good to me, just the open questions.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>260197</commentid>
    <comment_count>4</comment_count>
      <attachid>63480</attachid>
    <who name="Kavita Kanetkar">kkanetkar</who>
    <bug_when>2010-08-04 13:47:36 -0700</bug_when>
    <thetext>Comment on attachment 63480
patch

Thanks for review. I think there&apos;s a chrome bug/discussion somewhere about this online-detection. Sure, I can file a follow-up bug to enable this once chrome has resolved the other issue.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>260220</commentid>
    <comment_count>5</comment_count>
    <who name="Joseph Pecoraro">joepeck</who>
    <bug_when>2010-08-04 14:38:09 -0700</bug_when>
    <thetext>File / link to the follow-up and I will cq+ (if you can&apos;t). Thanks!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>260240</commentid>
    <comment_count>6</comment_count>
      <attachid>63480</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2010-08-04 15:22:14 -0700</bug_when>
    <thetext>Comment on attachment 63480
patch

Rejecting patch 63480 from commit-queue.

kkanetkar@chromium.org does not have committer permissions according to http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/common/config/committers.py.

- If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags.

- If you have committer rights please correct the error in WebKitTools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed).  Due to bug 30084 the commit-queue will require a restart after your change.  Please contact eseidel@chromium.org to request a commit-queue restart.  After restart the commit-queue will correctly respect your committer rights.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>260803</commentid>
    <comment_count>7</comment_count>
      <attachid>63480</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2010-08-05 13:18:32 -0700</bug_when>
    <thetext>Comment on attachment 63480
patch

Rejecting patch 63480 from commit-queue.

Failed to run &quot;[u&apos;/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply&apos;, u&apos;--reviewer&apos;, u&apos;Joseph Pecoraro&apos;, u&apos;--force&apos;]&quot; exit_code: 1
Parsed 5 diffs from patch file(s).
patching file WebKit/chromium/src/js/DevTools.js
Hunk #1 FAILED at 111.
1 out of 1 hunk FAILED -- saving rejects to file WebKit/chromium/src/js/DevTools.js.rej
patching file WebKit/chromium/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file WebCore/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file WebCore/inspector/front-end/Settings.js
patching file WebCore/inspector/front-end/ApplicationCacheItemsView.js

Full output: http://queues.webkit.org/results/3609768</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>260831</commentid>
    <comment_count>8</comment_count>
    <who name="Joseph Pecoraro">joepeck</who>
    <bug_when>2010-08-05 13:52:44 -0700</bug_when>
    <thetext>@Kavita, did this get out of date? Does it need to be rebaselined?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>260832</commentid>
    <comment_count>9</comment_count>
      <attachid>63631</attachid>
    <who name="Kavita Kanetkar">kkanetkar</who>
    <bug_when>2010-08-05 13:54:00 -0700</bug_when>
    <thetext>Created attachment 63631
patch2

Conflicting changes from Bug 43479 landed before this. Resolved. Please take a look.

Thanks.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>260838</commentid>
    <comment_count>10</comment_count>
      <attachid>63631</attachid>
    <who name="Joseph Pecoraro">joepeck</who>
    <bug_when>2010-08-05 14:01:49 -0700</bug_when>
    <thetext>Comment on attachment 63631
patch2

Thanks for updating!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>261221</commentid>
    <comment_count>11</comment_count>
      <attachid>63631</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2010-08-06 06:30:15 -0700</bug_when>
    <thetext>Comment on attachment 63631
patch2

Clearing flags on attachment: 63631

Committed r64844: &lt;http://trac.webkit.org/changeset/64844&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>261222</commentid>
    <comment_count>12</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2010-08-06 06:30:21 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>63480</attachid>
            <date>2010-08-04 12:38:56 -0700</date>
            <delta_ts>2010-08-05 13:54:00 -0700</delta_ts>
            <desc>patch</desc>
            <filename>onlinediff2.txt</filename>
            <type>text/plain</type>
            <size>5683</size>
            <attacher name="Kavita Kanetkar">kkanetkar</attacher>
            
              <data encoding="base64">SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvanMvRGV2VG9vbHMuanMKPT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g
V2ViS2l0L2Nocm9taXVtL3NyYy9qcy9EZXZUb29scy5qcwkocmV2aXNpb24gNjQ2NjIpCisrKyBX
ZWJLaXQvY2hyb21pdW0vc3JjL2pzL0RldlRvb2xzLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0xMTEs
NiArMTExLDcgQEAKICAgICBQcmVmZXJlbmNlcy5kZWJ1Z2dlckFsd2F5c0VuYWJsZWQgPSB0cnVl
OwogICAgIFByZWZlcmVuY2VzLnByb2ZpbGVyQWx3YXlzRW5hYmxlZCA9IHRydWU7CiAgICAgUHJl
ZmVyZW5jZXMuY2FuRWRpdFNjcmlwdFNvdXJjZSA9IHRydWU7CisgICAgUHJlZmVyZW5jZXMub25s
aW5lRGV0ZWN0aW9uRW5hYmxlZCA9IGZhbHNlOwogICAgIAogICAgIGlmICgicGFnZSIgaW4gV2Vi
SW5zcGVjdG9yLl9wYXJhbXNPYmplY3QpIHsKICAgICAgICAgV2ViSW5zcGVjdG9yLmxvYWRlZERv
bmUgPSB0cnVlOwpJbmRleDogV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwo9PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t
LSBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA2NDY2MykKKysrIFdlYktpdC9j
aHJvbWl1bS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAxMC0w
OC0wNCAgS2F2aXRhIEthbmV0a2FyICA8a2thbmV0a2FyQGNocm9taXVtLm9yZz4KKworICAgICAg
ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBS
ZW1vdmUgIk9ubGluZS9PZmZsaW5lIiBpY29uIGZvciBDaHJvbWUncyBhcHBjYWNoZSBkZXZ0b29s
cyBVSS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQz
NDUwCisKKyAgICAgICAgKiBzcmMvanMvRGV2VG9vbHMuanM6CisgICAgICAgIChXZWJJbnNwZWN0
b3IubG9hZGVkKToKKwogMjAxMC0wOC0wMiAgS2VubmV0aCBSdXNzZWxsICA8a2JyQGdvb2dsZS5j
b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgpJbmRleDogV2ViQ29y
ZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDY0
NjYzKQorKysgV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNiBA
QAorMjAxMC0wOC0wNCAgS2F2aXRhIEthbmV0a2FyICA8a2thbmV0a2FyQGNocm9taXVtLm9yZz4K
KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5z
cGVjdG9yOiBSZW1vdmUgIk9ubGluZS9PZmZsaW5lIiBpY29uIGZvciBDaHJvbWUncyBhcHBjYWNo
ZSBkZXZ0b29scyBVSS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu
Y2dpP2lkPTQzNDUwCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0FwcGxpY2F0aW9u
Q2FjaGVJdGVtc1ZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNo
ZUl0ZW1zVmlldyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZUl0ZW1z
Vmlldy5wcm90b3R5cGUuZ2V0IHN0YXR1c0Jhckl0ZW1zKToKKyAgICAgICAgKFdlYkluc3BlY3Rv
ci5BcHBsaWNhdGlvbkNhY2hlSXRlbXNWaWV3LnByb3RvdHlwZS51cGRhdGVOZXR3b3JrU3RhdGUp
OgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanM6CisKIDIwMTAtMDgt
MDMgIEtlbm5ldGggUnVzc2VsbCAgPGtickBnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2Vk
IGJ5IE5hdGUgQ2hhcGluLgpJbmRleDogV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRp
bmdzLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5n
cy5qcwkocmV2aXNpb24gNjQ2NjIpCisrKyBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0
dGluZ3MuanMJKHdvcmtpbmcgY29weSkKQEAgLTQzLDYgKzQzLDcgQEAKICAgICBkZWJ1Z2dlckFs
d2F5c0VuYWJsZWQ6IGZhbHNlLAogICAgIHByb2ZpbGVyQWx3YXlzRW5hYmxlZDogZmFsc2UsCiAg
ICAgYXVkaXRzUGFuZWxFbmFibGVkOiB0cnVlLAorICAgIG9ubGluZURldGVjdGlvbkVuYWJsZWQ6
IHRydWUKIH0KIAogV2ViSW5zcGVjdG9yLnBvcHVsYXRlQXBwbGljYXRpb25TZXR0aW5ncyA9IGZ1
bmN0aW9uKHNldHRpbmdzU3RyaW5nKQpJbmRleDogV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k
L0FwcGxpY2F0aW9uQ2FjaGVJdGVtc1ZpZXcuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9pbnNw
ZWN0b3IvZnJvbnQtZW5kL0FwcGxpY2F0aW9uQ2FjaGVJdGVtc1ZpZXcuanMJKHJldmlzaW9uIDY0
NjYyKQorKysgV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0FwcGxpY2F0aW9uQ2FjaGVJdGVt
c1ZpZXcuanMJKHdvcmtpbmcgY29weSkKQEAgLTQxLDEyICs0MSwxNCBAQAogICAgIHRoaXMucmVm
cmVzaEJ1dHRvbiA9IG5ldyBXZWJJbnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9uKFdlYkluc3BlY3Rv
ci5VSVN0cmluZygiUmVmcmVzaCIpLCAicmVmcmVzaC1zdG9yYWdlLXN0YXR1cy1iYXItaXRlbSIp
OwogICAgIHRoaXMucmVmcmVzaEJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMu
X3JlZnJlc2hCdXR0b25DbGlja2VkLmJpbmQodGhpcyksIGZhbHNlKTsKIAotICAgIHRoaXMuY29u
bmVjdGl2aXR5SWNvbiA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImltZyIpOwotICAgIHRoaXMu
Y29ubmVjdGl2aXR5SWNvbi5jbGFzc05hbWUgPSAic3RvcmFnZS1hcHBsaWNhdGlvbi1jYWNoZS1j
b25uZWN0aXZpdHktaWNvbiI7Ci0gICAgdGhpcy5jb25uZWN0aXZpdHlJY29uLnNyYyA9ICIiOwot
ICAgIHRoaXMuY29ubmVjdGl2aXR5TWVzc2FnZSA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNw
YW4iKTsKLSAgICB0aGlzLmNvbm5lY3Rpdml0eU1lc3NhZ2UuY2xhc3NOYW1lID0gInN0b3JhZ2Ut
YXBwbGljYXRpb24tY2FjaGUtY29ubmVjdGl2aXR5IjsKLSAgICB0aGlzLmNvbm5lY3Rpdml0eU1l
c3NhZ2UudGV4dENvbnRlbnQgPSAiIjsKKyAgICBpZiAoUHJlZmVyZW5jZXMub25saW5lRGV0ZWN0
aW9uRW5hYmxlZCkgeworICAgICAgICB0aGlzLmNvbm5lY3Rpdml0eUljb24gPSBkb2N1bWVudC5j
cmVhdGVFbGVtZW50KCJpbWciKTsKKyAgICAgICAgdGhpcy5jb25uZWN0aXZpdHlJY29uLmNsYXNz
TmFtZSA9ICJzdG9yYWdlLWFwcGxpY2F0aW9uLWNhY2hlLWNvbm5lY3Rpdml0eS1pY29uIjsKKyAg
ICAgICAgdGhpcy5jb25uZWN0aXZpdHlJY29uLnNyYyA9ICIiOworICAgICAgICB0aGlzLmNvbm5l
Y3Rpdml0eU1lc3NhZ2UgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7CisgICAgICAg
IHRoaXMuY29ubmVjdGl2aXR5TWVzc2FnZS5jbGFzc05hbWUgPSAic3RvcmFnZS1hcHBsaWNhdGlv
bi1jYWNoZS1jb25uZWN0aXZpdHkiOworICAgICAgICB0aGlzLmNvbm5lY3Rpdml0eU1lc3NhZ2Uu
dGV4dENvbnRlbnQgPSAiIjsKKyAgICB9CiAKICAgICB0aGlzLmRpdmlkZXIgPSBkb2N1bWVudC5j
cmVhdGVFbGVtZW50KCJzcGFuIik7CiAgICAgdGhpcy5kaXZpZGVyLmNsYXNzTmFtZSA9ICJzdGF0
dXMtYmFyLWl0ZW0gc3RhdHVzLWJhci1kaXZpZGVyIjsKQEAgLTcyLDExICs3NCwxOCBAQAogV2Vi
SW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVJdGVtc1ZpZXcucHJvdG90eXBlID0gewogICAgIGdl
dCBzdGF0dXNCYXJJdGVtcygpCiAgICAgewotICAgICAgICByZXR1cm4gWwotICAgICAgICAgICAg
dGhpcy5yZWZyZXNoQnV0dG9uLmVsZW1lbnQsIHRoaXMuZGVsZXRlQnV0dG9uLmVsZW1lbnQsCi0g
ICAgICAgICAgICB0aGlzLmNvbm5lY3Rpdml0eUljb24sIHRoaXMuY29ubmVjdGl2aXR5TWVzc2Fn
ZSwgdGhpcy5kaXZpZGVyLAotICAgICAgICAgICAgdGhpcy5zdGF0dXNJY29uLCB0aGlzLnN0YXR1
c01lc3NhZ2UKLSAgICAgICAgXTsKKyAgICAgICAgaWYgKFByZWZlcmVuY2VzLm9ubGluZURldGVj
dGlvbkVuYWJsZWQpIHsKKyAgICAgICAgICAgIHJldHVybiBbCisgICAgICAgICAgICAgICAgdGhp
cy5yZWZyZXNoQnV0dG9uLmVsZW1lbnQsIHRoaXMuZGVsZXRlQnV0dG9uLmVsZW1lbnQsCisgICAg
ICAgICAgICAgICAgdGhpcy5jb25uZWN0aXZpdHlJY29uLCB0aGlzLmNvbm5lY3Rpdml0eU1lc3Nh
Z2UsIHRoaXMuZGl2aWRlciwKKyAgICAgICAgICAgICAgICB0aGlzLnN0YXR1c0ljb24sIHRoaXMu
c3RhdHVzTWVzc2FnZQorICAgICAgICAgICAgXTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAg
ICAgIHJldHVybiBbCisgICAgICAgICAgICAgICAgdGhpcy5yZWZyZXNoQnV0dG9uLmVsZW1lbnQs
IHRoaXMuZGVsZXRlQnV0dG9uLmVsZW1lbnQsIHRoaXMuZGl2aWRlciwKKyAgICAgICAgICAgICAg
ICB0aGlzLnN0YXR1c0ljb24sIHRoaXMuc3RhdHVzTWVzc2FnZQorICAgICAgICAgICAgXTsKKyAg
ICAgICAgfQogICAgIH0sCiAKICAgICBzaG93OiBmdW5jdGlvbihwYXJlbnRFbGVtZW50KQpAQCAt
MTE0LDEyICsxMjMsMTQgQEAKIAogICAgIHVwZGF0ZU5ldHdvcmtTdGF0ZTogZnVuY3Rpb24oaXNO
b3dPbmxpbmUpCiAgICAgewotICAgICAgICBpZiAoaXNOb3dPbmxpbmUpIHsKLSAgICAgICAgICAg
IHRoaXMuY29ubmVjdGl2aXR5SWNvbi5zcmMgPSAiSW1hZ2VzL3N1Y2Nlc3NHcmVlbkRvdC5wbmci
OwotICAgICAgICAgICAgdGhpcy5jb25uZWN0aXZpdHlNZXNzYWdlLnRleHRDb250ZW50ID0gV2Vi
SW5zcGVjdG9yLlVJU3RyaW5nKCJPbmxpbmUiKTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAg
ICAgIHRoaXMuY29ubmVjdGl2aXR5SWNvbi5zcmMgPSAiSW1hZ2VzL2Vycm9yUmVkRG90LnBuZyI7
Ci0gICAgICAgICAgICB0aGlzLmNvbm5lY3Rpdml0eU1lc3NhZ2UudGV4dENvbnRlbnQgPSBXZWJJ
bnNwZWN0b3IuVUlTdHJpbmcoIk9mZmxpbmUiKTsKKyAgICAgICAgaWYgKFByZWZlcmVuY2VzLm9u
bGluZURldGVjdGlvbkVuYWJsZWQpIHsKKyAgICAgICAgICAgIGlmIChpc05vd09ubGluZSkgewor
ICAgICAgICAgICAgICAgIHRoaXMuY29ubmVjdGl2aXR5SWNvbi5zcmMgPSAiSW1hZ2VzL3N1Y2Nl
c3NHcmVlbkRvdC5wbmciOworICAgICAgICAgICAgICAgIHRoaXMuY29ubmVjdGl2aXR5TWVzc2Fn
ZS50ZXh0Q29udGVudCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiT25saW5lIik7CisgICAgICAg
ICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgIHRoaXMuY29ubmVjdGl2aXR5SWNvbi5zcmMg
PSAiSW1hZ2VzL2Vycm9yUmVkRG90LnBuZyI7CisgICAgICAgICAgICAgICAgdGhpcy5jb25uZWN0
aXZpdHlNZXNzYWdlLnRleHRDb250ZW50ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJPZmZsaW5l
Iik7CisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9LAogCg==
</data>
<flag name="review"
          id="51844"
          type_id="1"
          status="+"
          setter="joepeck"
    />
    <flag name="commit-queue"
          id="51854"
          type_id="3"
          status="-"
          setter="commit-queue"
    />
          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>63631</attachid>
            <date>2010-08-05 13:54:00 -0700</date>
            <delta_ts>2010-08-06 06:30:15 -0700</delta_ts>
            <desc>patch2</desc>
            <filename>onlinediff3.txt</filename>
            <type>text/plain</type>
            <size>5715</size>
            <attacher name="Kavita Kanetkar">kkanetkar</attacher>
            
              <data encoding="base64">SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvanMvRGV2VG9vbHMuanMKPT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g
V2ViS2l0L2Nocm9taXVtL3NyYy9qcy9EZXZUb29scy5qcwkocmV2aXNpb24gNjQ3NzgpCisrKyBX
ZWJLaXQvY2hyb21pdW0vc3JjL2pzL0RldlRvb2xzLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0xMTMs
NiArMTEzLDcgQEAKICAgICBQcmVmZXJlbmNlcy5kZWJ1Z2dlckFsd2F5c0VuYWJsZWQgPSB0cnVl
OwogICAgIFByZWZlcmVuY2VzLnByb2ZpbGVyQWx3YXlzRW5hYmxlZCA9IHRydWU7CiAgICAgUHJl
ZmVyZW5jZXMuY2FuRWRpdFNjcmlwdFNvdXJjZSA9IHRydWU7CisgICAgUHJlZmVyZW5jZXMub25s
aW5lRGV0ZWN0aW9uRW5hYmxlZCA9IGZhbHNlOwogICAgIGlmICgicGFnZSIgaW4gV2ViSW5zcGVj
dG9yLl9wYXJhbXNPYmplY3QpIHsKICAgICAgICAgV2ViSW5zcGVjdG9yLmxvYWRlZERvbmUgPSB0
cnVlOwogICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLnNvY2tldE9wZW5lZCkKSW5kZXg6IFdlYktp
dC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL0NoYW5n
ZUxvZwkocmV2aXNpb24gNjQ3ODEpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCSh3b3Jr
aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTAtMDgtMDUgIEthdml0YSBLYW5ldGthciAg
PGtrYW5ldGthckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP
T1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUmVtb3ZlICJPbmxpbmUvT2ZmbGluZSIg
aWNvbiBmb3IgQ2hyb21lJ3MgYXBwY2FjaGUgZGV2dG9vbHMgVUkuCisgICAgICAgIGh0dHBzOi8v
YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MzQ1MAorCisgICAgICAgICogc3JjL2pz
L0RldlRvb2xzLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLmxvYWRlZCk6CisKIDIwMTAtMDgt
MDQgIEtlbm5ldGggUnVzc2VsbCAgPGtickBnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2Vk
IGJ5IERpbWl0cmkgR2xhemtvdi4KSW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K
LS0tIFdlYkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiA2NDc4MSkKKysrIFdlYkNvcmUvQ2hhbmdl
TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMDgtMDUgIEthdml0YSBL
YW5ldGthciAgPGtrYW5ldGthckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg
Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUmVtb3ZlICJPbmxpbmUv
T2ZmbGluZSIgaWNvbiBmb3IgQ2hyb21lJ3MgYXBwY2FjaGUgZGV2dG9vbHMgVUkuCisgICAgICAg
IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MzQ1MAorCisgICAgICAg
ICogaW5zcGVjdG9yL2Zyb250LWVuZC9BcHBsaWNhdGlvbkNhY2hlSXRlbXNWaWV3LmpzOgorICAg
ICAgICAoV2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVJdGVtc1ZpZXcpOgorICAgICAgICAo
V2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVJdGVtc1ZpZXcucHJvdG90eXBlLmdldCBzdGF0
dXNCYXJJdGVtcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZUl0ZW1z
Vmlldy5wcm90b3R5cGUudXBkYXRlTmV0d29ya1N0YXRlKToKKyAgICAgICAgKiBpbnNwZWN0b3Iv
ZnJvbnQtZW5kL1NldHRpbmdzLmpzOgorCiAyMDEwLTA4LTA1ICBUb255IENoYW5nICA8dG9ueUBj
aHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgSHlhdHQuCkluZGV4OiBX
ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanMKPT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi
Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzCShyZXZpc2lvbiA2NDc3OCkKKysr
IFdlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcwkod29ya2luZyBjb3B5KQpA
QCAtNDMsNiArNDMsNyBAQAogICAgIGRlYnVnZ2VyQWx3YXlzRW5hYmxlZDogZmFsc2UsCiAgICAg
cHJvZmlsZXJBbHdheXNFbmFibGVkOiBmYWxzZSwKICAgICBhdWRpdHNQYW5lbEVuYWJsZWQ6IHRy
dWUsCisgICAgb25saW5lRGV0ZWN0aW9uRW5hYmxlZDogdHJ1ZQogfQogCiBXZWJJbnNwZWN0b3Iu
cG9wdWxhdGVBcHBsaWNhdGlvblNldHRpbmdzID0gZnVuY3Rpb24oc2V0dGluZ3NTdHJpbmcpCklu
ZGV4OiBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXBwbGljYXRpb25DYWNoZUl0ZW1zVmll
dy5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXBwbGljYXRp
b25DYWNoZUl0ZW1zVmlldy5qcwkocmV2aXNpb24gNjQ3NzgpCisrKyBXZWJDb3JlL2luc3BlY3Rv
ci9mcm9udC1lbmQvQXBwbGljYXRpb25DYWNoZUl0ZW1zVmlldy5qcwkod29ya2luZyBjb3B5KQpA
QCAtNDEsMTIgKzQxLDE0IEBACiAgICAgdGhpcy5yZWZyZXNoQnV0dG9uID0gbmV3IFdlYkluc3Bl
Y3Rvci5TdGF0dXNCYXJCdXR0b24oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZWZyZXNoIiksICJy
ZWZyZXNoLXN0b3JhZ2Utc3RhdHVzLWJhci1pdGVtIik7CiAgICAgdGhpcy5yZWZyZXNoQnV0dG9u
LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fcmVmcmVzaEJ1dHRvbkNsaWNrZWQuYmlu
ZCh0aGlzKSwgZmFsc2UpOwogCi0gICAgdGhpcy5jb25uZWN0aXZpdHlJY29uID0gZG9jdW1lbnQu
Y3JlYXRlRWxlbWVudCgiaW1nIik7Ci0gICAgdGhpcy5jb25uZWN0aXZpdHlJY29uLmNsYXNzTmFt
ZSA9ICJzdG9yYWdlLWFwcGxpY2F0aW9uLWNhY2hlLWNvbm5lY3Rpdml0eS1pY29uIjsKLSAgICB0
aGlzLmNvbm5lY3Rpdml0eUljb24uc3JjID0gIiI7Ci0gICAgdGhpcy5jb25uZWN0aXZpdHlNZXNz
YWdlID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpOwotICAgIHRoaXMuY29ubmVjdGl2
aXR5TWVzc2FnZS5jbGFzc05hbWUgPSAic3RvcmFnZS1hcHBsaWNhdGlvbi1jYWNoZS1jb25uZWN0
aXZpdHkiOwotICAgIHRoaXMuY29ubmVjdGl2aXR5TWVzc2FnZS50ZXh0Q29udGVudCA9ICIiOwor
ICAgIGlmIChQcmVmZXJlbmNlcy5vbmxpbmVEZXRlY3Rpb25FbmFibGVkKSB7CisgICAgICAgIHRo
aXMuY29ubmVjdGl2aXR5SWNvbiA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImltZyIpOworICAg
ICAgICB0aGlzLmNvbm5lY3Rpdml0eUljb24uY2xhc3NOYW1lID0gInN0b3JhZ2UtYXBwbGljYXRp
b24tY2FjaGUtY29ubmVjdGl2aXR5LWljb24iOworICAgICAgICB0aGlzLmNvbm5lY3Rpdml0eUlj
b24uc3JjID0gIiI7CisgICAgICAgIHRoaXMuY29ubmVjdGl2aXR5TWVzc2FnZSA9IGRvY3VtZW50
LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKKyAgICAgICAgdGhpcy5jb25uZWN0aXZpdHlNZXNzYWdl
LmNsYXNzTmFtZSA9ICJzdG9yYWdlLWFwcGxpY2F0aW9uLWNhY2hlLWNvbm5lY3Rpdml0eSI7Cisg
ICAgICAgIHRoaXMuY29ubmVjdGl2aXR5TWVzc2FnZS50ZXh0Q29udGVudCA9ICIiOworICAgIH0K
IAogICAgIHRoaXMuZGl2aWRlciA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKICAg
ICB0aGlzLmRpdmlkZXIuY2xhc3NOYW1lID0gInN0YXR1cy1iYXItaXRlbSBzdGF0dXMtYmFyLWRp
dmlkZXIiOwpAQCAtNzIsMTEgKzc0LDE4IEBACiBXZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNo
ZUl0ZW1zVmlldy5wcm90b3R5cGUgPSB7CiAgICAgZ2V0IHN0YXR1c0Jhckl0ZW1zKCkKICAgICB7
Ci0gICAgICAgIHJldHVybiBbCi0gICAgICAgICAgICB0aGlzLnJlZnJlc2hCdXR0b24uZWxlbWVu
dCwgdGhpcy5kZWxldGVCdXR0b24uZWxlbWVudCwKLSAgICAgICAgICAgIHRoaXMuY29ubmVjdGl2
aXR5SWNvbiwgdGhpcy5jb25uZWN0aXZpdHlNZXNzYWdlLCB0aGlzLmRpdmlkZXIsCi0gICAgICAg
ICAgICB0aGlzLnN0YXR1c0ljb24sIHRoaXMuc3RhdHVzTWVzc2FnZQotICAgICAgICBdOworICAg
ICAgICBpZiAoUHJlZmVyZW5jZXMub25saW5lRGV0ZWN0aW9uRW5hYmxlZCkgeworICAgICAgICAg
ICAgcmV0dXJuIFsKKyAgICAgICAgICAgICAgICB0aGlzLnJlZnJlc2hCdXR0b24uZWxlbWVudCwg
dGhpcy5kZWxldGVCdXR0b24uZWxlbWVudCwKKyAgICAgICAgICAgICAgICB0aGlzLmNvbm5lY3Rp
dml0eUljb24sIHRoaXMuY29ubmVjdGl2aXR5TWVzc2FnZSwgdGhpcy5kaXZpZGVyLAorICAgICAg
ICAgICAgICAgIHRoaXMuc3RhdHVzSWNvbiwgdGhpcy5zdGF0dXNNZXNzYWdlCisgICAgICAgICAg
ICBdOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgcmV0dXJuIFsKKyAgICAgICAgICAg
ICAgICB0aGlzLnJlZnJlc2hCdXR0b24uZWxlbWVudCwgdGhpcy5kZWxldGVCdXR0b24uZWxlbWVu
dCwgdGhpcy5kaXZpZGVyLAorICAgICAgICAgICAgICAgIHRoaXMuc3RhdHVzSWNvbiwgdGhpcy5z
dGF0dXNNZXNzYWdlCisgICAgICAgICAgICBdOworICAgICAgICB9CiAgICAgfSwKIAogICAgIHNo
b3c6IGZ1bmN0aW9uKHBhcmVudEVsZW1lbnQpCkBAIC0xMTQsMTIgKzEyMywxNCBAQAogCiAgICAg
dXBkYXRlTmV0d29ya1N0YXRlOiBmdW5jdGlvbihpc05vd09ubGluZSkKICAgICB7Ci0gICAgICAg
IGlmIChpc05vd09ubGluZSkgewotICAgICAgICAgICAgdGhpcy5jb25uZWN0aXZpdHlJY29uLnNy
YyA9ICJJbWFnZXMvc3VjY2Vzc0dyZWVuRG90LnBuZyI7Ci0gICAgICAgICAgICB0aGlzLmNvbm5l
Y3Rpdml0eU1lc3NhZ2UudGV4dENvbnRlbnQgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk9ubGlu
ZSIpOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgdGhpcy5jb25uZWN0aXZpdHlJY29u
LnNyYyA9ICJJbWFnZXMvZXJyb3JSZWREb3QucG5nIjsKLSAgICAgICAgICAgIHRoaXMuY29ubmVj
dGl2aXR5TWVzc2FnZS50ZXh0Q29udGVudCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiT2ZmbGlu
ZSIpOworICAgICAgICBpZiAoUHJlZmVyZW5jZXMub25saW5lRGV0ZWN0aW9uRW5hYmxlZCkgewor
ICAgICAgICAgICAgaWYgKGlzTm93T25saW5lKSB7CisgICAgICAgICAgICAgICAgdGhpcy5jb25u
ZWN0aXZpdHlJY29uLnNyYyA9ICJJbWFnZXMvc3VjY2Vzc0dyZWVuRG90LnBuZyI7CisgICAgICAg
ICAgICAgICAgdGhpcy5jb25uZWN0aXZpdHlNZXNzYWdlLnRleHRDb250ZW50ID0gV2ViSW5zcGVj
dG9yLlVJU3RyaW5nKCJPbmxpbmUiKTsKKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAg
ICAgICAgdGhpcy5jb25uZWN0aXZpdHlJY29uLnNyYyA9ICJJbWFnZXMvZXJyb3JSZWREb3QucG5n
IjsKKyAgICAgICAgICAgICAgICB0aGlzLmNvbm5lY3Rpdml0eU1lc3NhZ2UudGV4dENvbnRlbnQg
PSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk9mZmxpbmUiKTsKKyAgICAgICAgICAgIH0KICAgICAg
ICAgfQogICAgIH0sCiAK
</data>

          </attachment>
      

    </bug>

</bugzilla>