Bug 202636 - [GTK][WPE] Fix non-unified builds after r250486
Summary: [GTK][WPE] Fix non-unified builds after r250486
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: Other
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Adrian Perez
URL:
Keywords: InRadar
Depends on:
Blocks:
 
Reported: 2019-10-07 07:15 PDT by Adrian Perez
Modified: 2019-10-08 13:40 PDT (History)
37 users (show)

See Also:


Attachments
Patch (22.07 KB, patch)
2019-10-07 08:03 PDT, Adrian Perez
no flags Details | Formatted Diff | Diff
Patch v2 (22.49 KB, patch)
2019-10-08 05:28 PDT, Adrian Perez
no flags Details | Formatted Diff | Diff
Patch for landing (22.22 KB, patch)
2019-10-08 10:52 PDT, Adrian Perez
no flags Details | Formatted Diff | Diff
Patch for landing (13.49 KB, patch)
2019-10-08 12:31 PDT, Adrian Perez
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Adrian Perez 2019-10-07 07:15:08 PDT
Another batch of build issues has crept in, so I will be uploading a patch
for them momentarily.
Comment 1 Adrian Perez 2019-10-07 08:03:14 PDT
Created attachment 380327 [details]
Patch
Comment 2 Carlos Alberto Lopez Perez 2019-10-07 15:35:35 PDT
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.
Comment 3 youenn fablet 2019-10-08 00:02:40 PDT
(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.
Comment 4 Adrian Perez 2019-10-08 01:02:18 PDT
(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 :-)
Comment 5 Adrian Perez 2019-10-08 05:28:08 PDT
Created attachment 380422 [details]
Patch v2
Comment 6 Adrian Perez 2019-10-08 07:00:59 PDT
(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! =)
Comment 7 youenn fablet 2019-10-08 07:07:01 PDT
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?
Comment 8 Adrian Perez 2019-10-08 07:53:09 PDT
(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!
Comment 9 Adrian Perez 2019-10-08 10:52:27 PDT
Created attachment 380444 [details]
Patch for landing
Comment 10 WebKit Commit Bot 2019-10-08 10:53:16 PDT
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 commit-queue@webkit.org...
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
Comment 11 Adrian Perez 2019-10-08 12:31:13 PDT
Created attachment 380450 [details]
Patch for landing
Comment 12 WebKit Commit Bot 2019-10-08 13:39:20 PDT
Comment on attachment 380450 [details]
Patch for landing

Clearing flags on attachment: 380450

Committed r250857: <https://trac.webkit.org/changeset/250857>
Comment 13 WebKit Commit Bot 2019-10-08 13:39:23 PDT
All reviewed patches have been landed.  Closing bug.
Comment 14 Radar WebKit Bug Importer 2019-10-08 13:40:19 PDT
<rdar://problem/56086821>