Changeset 207201 in webkit


Ignore:
Timestamp:
Oct 12, 2016 1:41:15 AM (7 years ago)
Author:
matthew_hanson@apple.com
Message:

Merge r204428. rdar://problem/28476954

Location:
branches/safari-602-branch/Source/WebInspectorUI
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/safari-602-branch/Source/WebInspectorUI/ChangeLog

    r205707 r207201  
     12016-10-12  Matthew Hanson  <matthew_hanson@apple.com>
     2
     3        Merge r204428. rdar://problem/28476954
     4
     5    2016-08-12  Nikita Vasilyev  <nvasilyev@apple.com>
     6
     7            Web Inspector: Command-Shift-O causes infinite loop if web page has frames
     8            https://bugs.webkit.org/show_bug.cgi?id=160810
     9
     10            Reviewed by Joseph Pecoraro.
     11
     12            * UserInterface/Views/OpenResourceDialog.js:
     13            (WebInspector.OpenResourceDialog.prototype._addResourcesForFrame):
     14            "frame" doesn't change inside the loop.
     15
    1162016-09-09  Babak Shafiei  <bshafiei@apple.com>
    217
  • branches/safari-602-branch/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.js

    r199207 r207201  
    268268                this._addResource(resource, suppressFilterUpdate);
    269269
    270             frames = frames.concat(frame.childFrames);
     270            frames = frames.concat(currentFrame.childFrames);
    271271        }
    272272
Note: See TracChangeset for help on using the changeset viewer.