Use strongly typed identifiers for StorageArea / StorageAreaImpl. They currently both use uint64_t and are used in the same code, it is therefore very easy to confused the 2 types of identifiers.
Created attachment 376547 [details] Patch
Created attachment 376554 [details] Patch
Comment on attachment 376554 [details] Patch Rejecting attachment 376554 [details] from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 376554, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 5000 characters of output: torage/StorageArea.cpp Hunk #1 FAILED at 36. Hunk #2 succeeded at 89 (offset 1 line). Hunk #3 succeeded at 106 (offset 1 line). Hunk #4 succeeded at 125 (offset 1 line). Hunk #5 succeeded at 141 (offset 1 line). 1 out of 6 hunks FAILED -- saving rejects to file Source/WebKit/NetworkProcess/WebStorage/StorageArea.cpp.rej patching file Source/WebKit/NetworkProcess/WebStorage/StorageArea.h Hunk #2 FAILED at 44. Hunk #4 succeeded at 72 (offset -2 lines). Hunk #5 FAILED at 85. 2 out of 5 hunks FAILED -- saving rejects to file Source/WebKit/NetworkProcess/WebStorage/StorageArea.h.rej patching file Source/WebKit/NetworkProcess/WebStorage/StorageAreaIdentifier.h patching file Source/WebKit/NetworkProcess/WebStorage/StorageManagerSet.cpp Hunk #2 FAILED at 288. Hunk #3 FAILED at 317. Hunk #4 FAILED at 345. Hunk #5 succeeded at 357 (offset -10 lines). Hunk #6 succeeded at 368 (offset -10 lines). Hunk #7 succeeded at 378 (offset -10 lines). Hunk #8 succeeded at 386 (offset -10 lines). 3 out of 8 hunks FAILED -- saving rejects to file Source/WebKit/NetworkProcess/WebStorage/StorageManagerSet.cpp.rej patching file Source/WebKit/NetworkProcess/WebStorage/StorageManagerSet.h patching file Source/WebKit/NetworkProcess/WebStorage/StorageManagerSet.messages.in patching file Source/WebKit/Scripts/webkit/messages.py patching file Source/WebKit/WebKit.xcodeproj/project.pbxproj patching file Source/WebKit/WebProcess/Network/NetworkProcessConnection.cpp patching file Source/WebKit/WebProcess/WebProcess.cpp patching file Source/WebKit/WebProcess/WebProcess.h patching file Source/WebKit/WebProcess/WebStorage/StorageAreaImpl.cpp patching file Source/WebKit/WebProcess/WebStorage/StorageAreaImpl.h patching file Source/WebKit/WebProcess/WebStorage/StorageAreaImplIdentifier.h patching file Source/WebKit/WebProcess/WebStorage/StorageAreaMap.cpp patching file Source/WebKit/WebProcess/WebStorage/StorageAreaMap.h patching file Source/WebKit/WebProcess/WebStorage/StorageAreaMap.messages.in Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Alex Christensen']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Parsed 18 diffs from patch file(s). patching file Source/WebKit/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Source/WebKit/NetworkProcess/WebStorage/StorageArea.cpp Hunk #1 FAILED at 36. Hunk #2 succeeded at 89 (offset 1 line). Hunk #3 succeeded at 106 (offset 1 line). Hunk #4 succeeded at 125 (offset 1 line). Hunk #5 succeeded at 141 (offset 1 line). 1 out of 6 hunks FAILED -- saving rejects to file Source/WebKit/NetworkProcess/WebStorage/StorageArea.cpp.rej patching file Source/WebKit/NetworkProcess/WebStorage/StorageArea.h Hunk #2 FAILED at 44. Hunk #4 succeeded at 72 (offset -2 lines). Hunk #5 FAILED at 85. 2 out of 5 hunks FAILED -- saving rejects to file Source/WebKit/NetworkProcess/WebStorage/StorageArea.h.rej patching file Source/WebKit/NetworkProcess/WebStorage/StorageAreaIdentifier.h patching file Source/WebKit/NetworkProcess/WebStorage/StorageManagerSet.cpp Hunk #2 FAILED at 288. Hunk #3 FAILED at 317. Hunk #4 FAILED at 345. Hunk #5 succeeded at 357 (offset -10 lines). Hunk #6 succeeded at 368 (offset -10 lines). Hunk #7 succeeded at 378 (offset -10 lines). Hunk #8 succeeded at 386 (offset -10 lines). 3 out of 8 hunks FAILED -- saving rejects to file Source/WebKit/NetworkProcess/WebStorage/StorageManagerSet.cpp.rej patching file Source/WebKit/NetworkProcess/WebStorage/StorageManagerSet.h patching file Source/WebKit/NetworkProcess/WebStorage/StorageManagerSet.messages.in patching file Source/WebKit/Scripts/webkit/messages.py patching file Source/WebKit/WebKit.xcodeproj/project.pbxproj patching file Source/WebKit/WebProcess/Network/NetworkProcessConnection.cpp patching file Source/WebKit/WebProcess/WebProcess.cpp patching file Source/WebKit/WebProcess/WebProcess.h patching file Source/WebKit/WebProcess/WebStorage/StorageAreaImpl.cpp patching file Source/WebKit/WebProcess/WebStorage/StorageAreaImpl.h patching file Source/WebKit/WebProcess/WebStorage/StorageAreaImplIdentifier.h patching file Source/WebKit/WebProcess/WebStorage/StorageAreaMap.cpp patching file Source/WebKit/WebProcess/WebStorage/StorageAreaMap.h patching file Source/WebKit/WebProcess/WebStorage/StorageAreaMap.messages.in Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Alex Christensen']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Updating OpenSource From https://git.webkit.org/git/WebKit 2cfc4140242..ba2f1fb62a4 master -> origin/master Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 248808 = 2cfc4140242316f45765ffc4cf2b9e194bd3da48 r248809 = ba2f1fb62a4f35394085f45ab814d160c05d60f6 Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/origin/master. Full output: https://webkit-queues.webkit.org/results/12928548
Created attachment 376591 [details] Patch
Comment on attachment 376591 [details] Patch Clearing flags on attachment: 376591 Committed r248817: <https://trac.webkit.org/changeset/248817>
All reviewed patches have been landed. Closing bug.
<rdar://problem/54420552>