diff options
author | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-25 05:14:22 +0000 |
---|---|---|
committer | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-25 05:14:22 +0000 |
commit | 81737d203d40abaa318f612527db2b18a4e267e0 (patch) | |
tree | 76ddd3a305ef260b081d692e6bbe77b2dc3a99fb /chrome/browser/resources | |
parent | 760614e64f91d68fde2ccf6661ca5dc5931c9f4b (diff) | |
download | chromium_src-81737d203d40abaa318f612527db2b18a4e267e0.zip chromium_src-81737d203d40abaa318f612527db2b18a4e267e0.tar.gz chromium_src-81737d203d40abaa318f612527db2b18a4e267e0.tar.bz2 |
ui/list.js: prevent to set removed item to pinnedItem.
ensureAllItemSizesInCache() creates temporary list items and caches them, but temporary list items are removed from the list. Removed item is not belong to the list, so that it cannot be a pinnedItem.
BUG=none
TEST=manual
Review URL: http://codereview.chromium.org/9159016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119011 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources')
-rw-r--r-- | chrome/browser/resources/shared/js/cr/ui/list.js | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/chrome/browser/resources/shared/js/cr/ui/list.js b/chrome/browser/resources/shared/js/cr/ui/list.js index 8766f11..6405011 100644 --- a/chrome/browser/resources/shared/js/cr/ui/list.js +++ b/chrome/browser/resources/shared/js/cr/ui/list.js @@ -972,6 +972,12 @@ cr.define('cr.ui', function() { while (currentIndex < lastIndex) insert(this); + + + for (var i in newCachedItems) { + if (!newCachedItems[i].parentElement) + console.log("I'm hogehgoe! " + i); + } }, /** @@ -1083,7 +1089,10 @@ cr.define('cr.ui', function() { this.removeChild(this.pinnedItem_); this.pinnedItem_ = undefined; } - this.pinnedItem_ = this.pinnedItem_ || cachedItems[leadIndex]; + if (!this.pinnedItem_ && cachedItems[leadIndex] && + cachedItems[leadIndex].parentNode == this) { + this.pinnedItem_ = cachedItems[leadIndex]; + } this.mergeItems(firstIndex, lastIndex, cachedItems, newCachedItems); |