Bug 78717 - Web Inspector: revert 'modification of DOM upon single click for selected nodes'.
Summary: Web Inspector: revert 'modification of DOM upon single click for selected nod...
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Web Inspector (Deprecated) (show other bugs)
Version: 528+ (Nightly build)
Hardware: All All
: P2 Normal
Assignee: Pavel Feldman
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-02-15 07:48 PST by Pavel Feldman
Modified: 2012-02-16 07:36 PST (History)
11 users (show)

See Also:

Attachments
Patch (2.20 KB, patch)
2012-02-15 07:54 PST, Pavel Feldman 		vsevik: review+
Details | Formatted Diff | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Pavel Feldman 2012-02-15 07:48:58 PST 
It was acting unexpectedly a couple of times, reverting.
Comment 1 Pavel Feldman 2012-02-15 07:54:14 PST 
Created attachment 127185 [details]
Patch
Comment 2 WebKit Review Bot 2012-02-15 08:01:04 PST 
Attachment 127185 [details] 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.
Comment 3 Pavel Feldman 2012-02-16 07:36:58 PST 
Committed r107934: <http://trac.webkit.org/changeset/107934>