78717 2012-02-15 07:48:58 -0800 Web Inspector: revert 'modification of DOM upon single click for selected nodes'. 2012-02-16 07:36:58 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 557275 0 pfeldman 2012-02-15 07:48:58 -0800 It was acting unexpectedly a couple of times, reverting. 557276 1 127185 pfeldman 2012-02-15 07:54:14 -0800 Created attachment 127185 Patch 557279 2 webkit.review.bot 2012-02-15 08:01:04 -0800 Attachment 127185 did not pass style-queue: Failed to run "['Tools/Scripts/update-webkit']" exit_code: 9 Updating OpenSource From git://git.webkit.org/WebKit + 72b38cb...c442b28 master -> origin/master (forced update) Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 107815 = 72b38cbe0bdc3026442353790988d550262ec467 r107814 = 279c4308686a93295ab33cb48fced4cc8204f135 r107815 = 22f3f5a711e6061257c5d47453710bcd8d9668be r107816 = dd98f21199896f8b898d32b2b6828591520bdce0 r107817 = c442b2890045bf007eb1c879c2bc6569612eeffe Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc M Source/WebCore/ChangeLog M Source/WebCore/platform/graphics/filters/SourceAlpha.cpp M Source/WebCore/platform/graphics/filters/FEComposite.cpp r107818 = e8ae89e4e0b9d05d8d2a8a55d581cd71fa1cc325 (refs/remotes/origin/master) M Source/WebKit/qt/WebCoreSupport/PageClientQt.cpp M Source/WebKit/qt/ChangeLog r107819 = 5b6ddf427ec359895ac1f7794883da783f9ecee5 (refs/remotes/origin/master) First, rewinding head to replay your work on top of it... Applying: [Qt] Move Qt platform specific GL Context/Surface creation out of WebCore into WebKit Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging Source/WebCore/ChangeLog Auto-merging Source/WebCore/platform/graphics/GraphicsContext3D.h CONFLICT (content): Merge conflict in Source/WebCore/platform/graphics/GraphicsContext3D.h Auto-merging Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp CONFLICT (content): Merge conflict in Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp Auto-merging Source/WebKit/qt/ChangeLog CONFLICT (content): Merge conflict in Source/WebKit/qt/ChangeLog Auto-merging Source/WebKit/qt/WebCoreSupport/PageClientQt.cpp CONFLICT (content): Merge conflict in Source/WebKit/qt/WebCoreSupport/PageClientQt.cpp Failed to merge in the changes. Patch failed at 0001 [Qt] Move Qt platform specific GL Context/Surface creation out of WebCore into WebKit When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/origin/master: command returned error: 1 Died at Tools/Scripts/update-webkit line 164. If any of these errors are false positives, please file a bug against check-webkit-style. 558179 3 pfeldman 2012-02-16 07:36:58 -0800 Committed r107934: <http://trac.webkit.org/changeset/107934> 127185 2012-02-15 07:54:14 -0800 2012-02-16 05:51:47 -0800 Patch bug-78717-20120215195412.patch text/plain 2249 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTA3ODAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDAxZjA2NDAzM2UyZDJm MzUxMjdhNzQxMDk0NTllMTBmNDg1NGU4My4uN2U4MTY1YWViMTk1MmRkZTkyZWY0MzJiNTU2Yjdl MmUxYmY1NjM4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEyLTAyLTE1ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiByZXZlcnQgJ21vZGlmaWNhdGlvbiBvZiBET00gdXBvbiBzaW5nbGUgY2xpY2sgZm9yIHNlbGVj dGVkIG5vZGVzJy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTc4NzE3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlRWxlbWVudC5wcm90b3R5cGUub25hdHRhY2gpOgor CiAyMDEyLTAyLTEzICBWc2V2b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFdlYiBJbnNwZWN0b3I6IFtJbnNwZWN0b3JJbmRleGVkREJdIFBhc3MgZGF0YSBlbnRy aWVzIGZyb20gb2JqZWN0IHN0b3JlcyBhbmQgaW5kZXhlcyB0byBmcm9udC1lbmQuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxp bmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91 dGxpbmUuanMKaW5kZXggNWMzZmU3YWQ5ZmY4ZTdhOGI3YmE5ZDcwNDAzZDU4N2E1NDZiYTZiMC4u MTM2N2ZkZWY2MDZjNTA3YWU1YWFhOWFhNjRmOWI5ZGE2MmJhNzUxMyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpzCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNUcmVlT3V0bGlu ZS5qcwpAQCAtNzMyLDggKzczMiw2IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVFbGVtZW50 LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy51cGRhdGVUaXRsZSgpOwogICAgICAgICB0aGlz Ll9wcmV2ZW50Rm9sbG93aW5nTGlua3NPbkRvdWJsZUNsaWNrKCk7CiAgICAgICAgIHRoaXMubGlz dEl0ZW1FbGVtZW50LmRyYWdnYWJsZSA9IHRydWU7Ci0gICAgICAgIHRoaXMubGlzdEl0ZW1FbGVt ZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fbW91c2VDbGljay5iaW5kKHRoaXMp KTsKLSAgICAgICAgdGhpcy5saXN0SXRlbUVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vk b3duIiwgdGhpcy5fbW91c2VEb3duLmJpbmQodGhpcykpOwogICAgIH0sCiAKICAgICBfcHJldmVu dEZvbGxvd2luZ0xpbmtzT25Eb3VibGVDbGljazogZnVuY3Rpb24oKQpAQCAtMTAwOCwyMCArMTAw Niw2IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAg ICAgICAgICAgIHRoaXMuZXhwYW5kKCk7CiAgICAgfSwKIAotICAgIF9tb3VzZUNsaWNrOiBmdW5j dGlvbihldmVudCkKLSAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9pc1NpbmdsZUNsaWNrQ2FuZGlk YXRlKQotICAgICAgICAgICAgdGhpcy5fc3RhcnRFZGl0aW5nVGFyZ2V0KGV2ZW50LnRhcmdldCk7 Ci0gICAgICAgIHRoaXMuX2lzU2luZ2xlQ2xpY2tDYW5kaWRhdGUgPSBmYWxzZTsKLSAgICB9LAot Ci0gICAgX21vdXNlRG93bjogZnVuY3Rpb24oZXZlbnQpCi0gICAgewotICAgICAgICBpZiAoZXZl bnQuaGFuZGxlZCB8fCBldmVudC53aGljaCAhPT0gMSB8fCB0aGlzLl9lZGl0aW5nIHx8IHRoaXMu X2VsZW1lbnRDbG9zZVRhZyB8fCAhdGhpcy5zZWxlY3RlZCkKLSAgICAgICAgICAgIHJldHVybjsK LSAgICAgICAgdGhpcy5faXNTaW5nbGVDbGlja0NhbmRpZGF0ZSA9IHRydWU7Ci0gICAgfSwKLQog ICAgIF9pbnNlcnRJbkxhc3RBdHRyaWJ1dGVQb3NpdGlvbjogZnVuY3Rpb24odGFnLCBub2RlKQog ICAgIHsKICAgICAgICAgaWYgKHRhZy5nZXRFbGVtZW50c0J5Q2xhc3NOYW1lKCJ3ZWJraXQtaHRt bC1hdHRyaWJ1dGUiKS5sZW5ndGggPiAwKQo=