Bug 78611 – [Qt] Eliminate first set of QtWidgets dependencies from WebCore

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Simon Hausmann]

[Qt] Eliminate first set of QtWidgets dependencies from WebCore

[Simon Hausmann]

Created attachment 126993 [details]
Patch

[Early Warning System Bot]

Comment on attachment 126993 [details]
Patch

Attachment 126993 [details] did not pass qt-ews (qt):
Output: http://queues.webkit.org/results/11522308

[WebKit Review Bot]

Attachment 126993 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/update-webkit']" exit_code: 9

Last 3072 characters of output:
p/tests/inspector/elements-test.js
	M	LayoutTests/inspector/styles/undo-change-property-expected.txt
	M	LayoutTests/inspector/styles/undo-add-property-expected.txt
	M	LayoutTests/inspector/styles/undo-add-new-rule-expected.txt
	M	LayoutTests/inspector/styles/undo-set-selector-text-expected.txt
	M	LayoutTests/inspector/styles/undo-change-property.html
	M	LayoutTests/inspector/styles/undo-add-property.html
	M	LayoutTests/inspector/styles/undo-add-new-rule.html
	M	LayoutTests/inspector/styles/undo-set-selector-text.html
	M	LayoutTests/inspector/styles/undo-property-toggle-expected.txt
	M	LayoutTests/inspector/styles/undo-property-toggle.html
	M	LayoutTests/inspector/elements/undo-dom-edits-2-expected.txt
	M	LayoutTests/inspector/elements/undo-dom-edits-expected.txt
	M	LayoutTests/ChangeLog
	M	Source/WebCore/ChangeLog
	M	Source/WebCore/inspector/front-end/DOMAgent.js
	M	Source/WebCore/inspector/front-end/CSSStyleModel.js
	M	Source/WebCore/inspector/front-end/ElementsPanel.js
	M	Source/WebCore/inspector/InspectorHistory.cpp
	M	Source/WebCore/inspector/InspectorDOMAgent.h
	M	Source/WebCore/inspector/Inspector.json
	M	Source/WebCore/inspector/InspectorCSSAgent.cpp
	M	Source/WebCore/inspector/DOMEditor.cpp
	M	Source/WebCore/inspector/InspectorDOMAgent.cpp
	M	Source/WebCore/inspector/InspectorHistory.h
r107792 = a9730c4e2cf51fc2723bd4e3129fbec8e7be2e6d (refs/remotes/origin/master)
First, rewinding head to replay your work on top of it...
Applying: [Mac][Win][WK2] Switch to RFC 6455 protocol for WebSockets
Using index info to reconstruct a base tree...
<stdin>:1578: trailing whitespace.
        
<stdin>:1647: trailing whitespace.
    
<stdin>:1657: trailing whitespace.
    
<stdin>:1672: trailing whitespace.
        return 0;        
<stdin>:1674: trailing whitespace.
    
warning: squelched 7 whitespace errors
warning: 12 lines add whitespace errors.
Falling back to patching base and 3-way merge...
warning: too many files (created: 168753 deleted: 3), skipping inexact rename detection
Auto-merging LayoutTests/ChangeLog
CONFLICT (content): Merge conflict in LayoutTests/ChangeLog
Auto-merging LayoutTests/platform/wk2/Skipped
Auto-merging Source/WebCore/ChangeLog
Auto-merging Source/WebCore/css/CSSCalculationValue.cpp
Auto-merging Source/WebCore/css/CSSCalculationValue.h
Auto-merging Source/WebCore/css/CSSParser.cpp
Auto-merging Source/WebKit/mac/ChangeLog
CONFLICT (content): Merge conflict in Source/WebKit/mac/ChangeLog
Auto-merging Source/WebKit2/ChangeLog
CONFLICT (content): Merge conflict in Source/WebKit2/ChangeLog
Auto-merging Tools/ChangeLog
CONFLICT (content): Merge conflict in Tools/ChangeLog
Failed to merge in the changes.
Patch failed at 0001 [Mac][Win][WK2] Switch to RFC 6455 protocol for WebSockets

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.

[Simon Hausmann]

Created attachment 127153 [details]
Patch

[Kenneth Rohde Christiansen]

Comment on attachment 127153 [details]
Patch

r=me, good work. Nice descriptions :-)

[Early Warning System Bot]

Comment on attachment 127153 [details]
Patch

Attachment 127153 [details] did not pass qt-ews (qt):
Output: http://queues.webkit.org/results/11515745

[Simon Hausmann]

Committed r107811: <http://trac.webkit.org/changeset/107811>

[Csaba Osztrogonác]

(In reply to comment #7)
> Committed r107811: <http://trac.webkit.org/changeset/107811>

It broke 4 tests on Qt 4.8 (on Qt5 plugin tests are skipped because of https://bugs.webkit.org/show_bug.cgi?id=70023)

Could you check if these new results are correct or not?

[Csaba Osztrogonác]

Results can be found here:
http://build.webkit.sed.hu/results/x86-64%20Linux%20Qt%20Release/r107811%20%2833778%29/results.html

[Csaba Osztrogonác]

And it broke Qt Mac build too:
http://build.webkit.sed.hu/builders/Qt%20Lion%20Intel%20Release/builds/487/steps/compile-webkit/logs/stdio

[Csaba Osztrogonác]

(In reply to comment #9)
> Results can be found here:
> http://build.webkit.sed.hu/results/x86-64%20Linux%20Qt%20Release/r107811%20%2833778%29/results.html

I updated the expected files - http://trac.webkit.org/changeset/107892
I assumed the new ones are correct. Please validate them.

And otherwise Mac build is still broken. Are you going to fix it?

[Simon Hausmann]

(In reply to comment #11)
> (In reply to comment #9)
> > Results can be found here:
> > http://build.webkit.sed.hu/results/x86-64%20Linux%20Qt%20Release/r107811%20%2833778%29/results.html
> 
> I updated the expected files - http://trac.webkit.org/changeset/107892
> I assumed the new ones are correct. Please validate them.

Argh, yes, I forgot to update them. Thanks! The new ones you submitted are correct.

> And otherwise Mac build is still broken. Are you going to fix it?

Prospective build fix landed in r107913. I'll watch the bot.