Bug 202636 – [GTK][WPE] Fix non-unified builds after r250486

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[Adrian Perez]

Another batch of build issues has crept in, so I will be uploading a patch
for them momentarily.

[Adrian Perez]

Created attachment 380327 [details]
Patch

[Carlos Alberto Lopez Perez]

Comment on attachment 380327 [details]
Patch

Seems to breaks mac EWS with:

Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp:65:10: fatal error: 'WebCore/Logging.h' file not found
#include <WebCore/Logging.h>
         ^~~~~~~~~~~~~~~~~~~
1 error generated.

[youenn fablet]

(In reply to Carlos Alberto Lopez Perez from comment #2)
> Comment on attachment 380327 [details]
> Patch
> 
> Seems to breaks mac EWS with:
> 
> Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp:65:10: fatal
> error: 'WebCore/Logging.h' file not found
> #include <WebCore/Logging.h>
>          ^~~~~~~~~~~~~~~~~~~
> 1 error generated.

Why do we need this one? Can we just use WebKit Logging.h?

If we really need this one, WebCore Logging.h should be marked as private (from Xcode).
If that is the only issue, maybe you could land the rest of the patch.

[Adrian Perez]

(In reply to youenn fablet from comment #3)
> (In reply to Carlos Alberto Lopez Perez from comment #2)
> > Comment on attachment 380327 [details]
> > Patch
> > 
> > Seems to breaks mac EWS with:
> > 
> > Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp:65:10: fatal
> > error: 'WebCore/Logging.h' file not found
> > #include <WebCore/Logging.h>
> >          ^~~~~~~~~~~~~~~~~~~
> > 1 error generated.
> 
> Why do we need this one? Can we just use WebKit Logging.h?

Probably WebKit's header will do, I'll give it a try later today.

> If we really need this one, WebCore Logging.h should be marked as private
> (from Xcode).
> If that is the only issue, maybe you could land the rest of the patch.

I hope this won't be needed in the end :-)

[Adrian Perez]

Created attachment 380422 [details]
Patch v2

[Adrian Perez]

(In reply to Adrian Perez from comment #4)
> (In reply to youenn fablet from comment #3)
> > (In reply to Carlos Alberto Lopez Perez from comment #2)
> > > Comment on attachment 380327 [details]
> > > Patch
> > > 
> > > Seems to breaks mac EWS with:
> > > 
> > > Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp:65:10: fatal
> > > error: 'WebCore/Logging.h' file not found
> > > #include <WebCore/Logging.h>
> > >          ^~~~~~~~~~~~~~~~~~~
> > > 1 error generated.
> > 
> > Why do we need this one? Can we just use WebKit Logging.h?
> 
> Probably WebKit's header will do, I'll give it a try later today.

Using WebKit's "Logging.h" (instead of WebCore's) worked fine, and the
EWS bots are happy now. Thanks for the suggestion, Youenn! =)

[youenn fablet]

Comment on attachment 380422 [details]
Patch v2

View in context: https://bugs.webkit.org/attachment.cgi?id=380422&action=review

> Source/WebCore/html/canvas/WebGLFramebuffer.h:131
> +    WTF::Vector<GC3Denum> m_filteredDrawBuffers;

Is WTF:: needed here, I do not think we need them in other WebCore files?

[Adrian Perez]

(In reply to youenn fablet from comment #7)
> Comment on attachment 380422 [details]
> Patch v2
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=380422&action=review
> 
> > Source/WebCore/html/canvas/WebGLFramebuffer.h:131
> > +    WTF::Vector<GC3Denum> m_filteredDrawBuffers;
> 
> Is WTF:: needed here, I do not think we need them in other WebCore files?

You are right, the prefix here is not really needed because at the
end of <wtf/Vector.h> there is already an “using WTF::Vector;”
statement. I will leave this as it was before landing, thanks
again!

[Adrian Perez]

Created attachment 380444 [details]
Patch for landing

[WebKit Commit Bot]

Comment on attachment 380444 [details]
Patch for landing

Rejecting attachment 380444 [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-03', 'apply-attachment', '--no-update', '--non-interactive', 380444, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit

Logging in as [e-mail]...
Fetching: https://bugs.webkit.org/attachment.cgi?id=380444&action=edit
Fetching: https://bugs.webkit.org/show_bug.cgi?id=202636&ctype=xml&excludefield=attachmentdata
Processing 1 patch from 1 bug.
Processing patch 380444 from bug 202636.
Fetching: https://bugs.webkit.org/attachment.cgi?id=380444
Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

Parsed 34 diffs from patch file(s).
patching file Source/JavaScriptCore/ChangeLog
patching file Source/WebCore/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file Source/WebKit/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file Source/JavaScriptCore/runtime/JSLock.h
patching file Source/JavaScriptCore/wasm/WasmSignature.cpp
patching file Source/JavaScriptCore/wasm/WasmStreamingParser.cpp
patching file Source/WebCore/Modules/fetch/FetchLoader.h
patching file Source/WebCore/Modules/indexeddb/shared/IDBGetAllRecordsData.cpp
patching file Source/WebCore/Modules/indexeddb/shared/IDBIterateCursorData.cpp
patching file Source/WebCore/animation/DocumentTimeline.cpp
patching file Source/WebCore/bindings/js/JSDOMWindowCustom.cpp
patching file Source/WebCore/bindings/js/JSIDBRequestCustom.cpp
patching file Source/WebCore/bindings/js/JSRemoteDOMWindowCustom.cpp
patching file Source/WebCore/bindings/js/ScriptController.cpp
patching file Source/WebCore/bindings/js/ScriptModuleLoader.h
patching file Source/WebCore/bindings/js/WindowProxy.cpp
patching file Source/WebCore/css/FontFaceSet.cpp
patching file Source/WebCore/css/FontFaceSet.h
patching file Source/WebCore/dom/IdleDeadline.h
Hunk #1 FAILED at 27.
1 out of 1 hunk FAILED -- saving rejects to file Source/WebCore/dom/IdleDeadline.h.rej
patching file Source/WebCore/history/CachedPage.h
patching file Source/WebCore/html/canvas/WebGLBuffer.h
patching file Source/WebCore/html/canvas/WebGLFramebuffer.h
patching file Source/WebCore/html/canvas/WebGLProgram.h
patching file Source/WebCore/html/canvas/WebGLShader.h
patching file Source/WebCore/inspector/InspectorController.cpp
patching file Source/WebCore/inspector/agents/InspectorCanvasAgent.cpp
patching file Source/WebCore/page/DOMWindowExtension.cpp
patching file Source/WebCore/page/scrolling/nicosia/ScrollingTreeFixedNode.cpp
patching file Source/WebCore/page/scrolling/nicosia/ScrollingTreeFrameScrollingNodeNicosia.cpp
patching file Source/WebCore/page/scrolling/nicosia/ScrollingTreeOverflowScrollingNodeNicosia.cpp
patching file Source/WebCore/page/scrolling/nicosia/ScrollingTreeStickyNode.cpp
patching file Source/WebCore/platform/SuspendableTaskQueue.cpp
patching file Source/WebCore/workers/Worker.cpp
patching file Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp

Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

Full output: https://webkit-queues.webkit.org/results/13106951

[Adrian Perez]

Created attachment 380450 [details]
Patch for landing

[WebKit Commit Bot]

Comment on attachment 380450 [details]
Patch for landing

Clearing flags on attachment: 380450

Committed r250857: <https://trac.webkit.org/changeset/250857>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Radar WebKit Bug Importer]

<rdar://problem/56086821>