Skip to content
This repository was archived by the owner on Apr 3, 2020. It is now read-only.

[Blink] WebCL: Remove config.h and ENABLE_WEBCL. #316

Merged
merged 4 commits into from
Feb 17, 2016

Conversation

shaoboyan
Copy link
Contributor

This PR resolve XWALK-6200.

  1. replace config.h which removed by upstream with "wtf/build_config.h" and resolve some other compile errors.
  2. Abandon "Conditional" attributes which removed by upstream and enable WebCL through gyp. This patch also removed ENABLE_WEBCL macro.

@shaoboyan
Copy link
Contributor Author

@rakuco @Bysmyyr @hujiajie PTAL

@shaoboyan
Copy link
Contributor Author

@Bysmyyr, I've fixed the compile problem. Build without -Denable_webcl=1 on linux won't cause any compile error. And WebCL will be enabled only by -Denable_webcl=1 on linux. Pls have a try.

@Bysmyyr
Copy link
Contributor

Bysmyyr commented Feb 16, 2016

Morning, testing now, thanks.

ps. you do not need new pr, just force push to that previous

@Bysmyyr
Copy link
Contributor

Bysmyyr commented Feb 16, 2016

hi, I found build errror:

bysmyyr:crosswalk> nice -n 19 ninja -j 6 -C src/out/Release xwalk_builder ninja: Entering directorysrc/out/Release'
[3844/4092] CXX obj/third_party/WebKit/Source/modules/webcl/modules.WebCLKernelArgInfoProvider.o
FAILED: ../../third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF obj/third_party/WebKit/Source/modules/webcl/modules.WebCLKernelArgInfoProvider.o.d -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_FILE_OFFSET_BITS=64 -DCHROMIUM_BUILD -DCR_CLANG_REVISION=255169-1 -DUI_COMPOSITOR_IMAGE_TRANSPORT -DUSE_AURA=1 -DUSE_ASH=1 -DUSE_PANGO=1 -DUSE_CAIRO=1 -DUSE_DEFAULT_RENDER_THEME=1 -DUSE_LIBJPEG_TURBO=1 -DUSE_X11=1 -DUSE_CLIPBOARD_AURAX11=1 -DENABLE_ONE_CLICK_SIGNIN -DENABLE_WEBRTC=1 -DENABLE_MEDIA_ROUTER=1 -DUSE_PROPRIETARY_CODECS -DENABLE_PEPPER_CDMS -DENABLE_CONFIGURATION_POLICY -DENABLE_NOTIFICATIONS -DENABLE_HIDPI=1 -DENABLE_TOPCHROME_MD=1 -DUSE_UDEV -DDONT_EMBED_BUILD_METADATA -DFIELDTRIAL_TESTING_ENABLED -DENABLE_TASK_MANAGER=1 -DENABLE_EXTENSIONS=1 -DENABLE_PDF=1 -DENABLE_PLUGINS=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_THEMES=1 -DENABLE_AUTOFILL_DIALOG=1 -DENABLE_BACKGROUND=1 -DENABLE_PRINTING=1 -DENABLE_BASIC_PRINTING=1 -DENABLE_PRINT_PREVIEW=1 -DENABLE_SPELLCHECK=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_APP_LIST=1 -DENABLE_SETTINGS_APP=1 -DENABLE_SUPERVISED_USERS=1 -DENABLE_MDNS=1 -DENABLE_SERVICE_DISCOVERY=1 -DV8_USE_EXTERNAL_STARTUP_DATA -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DBLINK_IMPLEMENTATION=1 -DINSIDE_BLINK -DGL_GLEXT_PROTOTYPES -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DENABLE_LAYOUT_UNIT_IN_INLINE_BOXES=0 -DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1 -DENABLE_INPUT_MULTIPLE_FIELDS_UI=1 -DWTF_USE_ICCJPEG=1 -DWTF_USE_QCMSLIB=1 -DWTF_USE_WEBAUDIO_FFMPEG=1 -DWTF_USE_DEFAULT_RENDER_THEME=1 -DENABLE_WEBCL=1 -DSK_SUPPORT_GPU=1 -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -DUSE_GLIB=1 -DUSE_NSS_CERTS=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -Igen -I../.. -I../../skia/config -I../../third_party/WebKit/Source -I../../third_party/khronos -I../../gpu -Igen/angle -I../../third_party/icu/source/i18n -I../../third_party/icu/source/common -I../../third_party/zlib -I../../third_party/WebKit -Igen/blink -I../../third_party/libpng -I../../third_party/libwebp -I../../third_party/ots/include -I../../third_party/iccjpeg -I../../third_party/libjpeg_turbo -I../../third_party/skia/include/core -I../../third_party/skia/include/effects -I../../third_party/skia/include/pdf -I../../third_party/skia/include/gpu -I../../third_party/skia/include/lazy -I../../third_party/skia/include/pathops -I../../third_party/skia/include/pipe -I../../third_party/skia/include/ports -I../../third_party/skia/include/utils -I../../skia/ext -I../../third_party/npapi -I../../third_party/npapi/bindings -I../../third_party/qcms/src -I../../v8/include -fstack-protector --param=ssp-buffer-size=4 -Werror -pthread -fno-strict-aliasing -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -fvisibility=hidden -pipe -fPIC -Xclang -load -Xclang /home/bysmyyr/crosswalk/src/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.so -Xclang -add-plugin -Xclang find-bad-constructs -Xclang -plugin-arg-find-bad-constructs -Xclang check-templates -fcolor-diagnostics -B/home/bysmyyr/crosswalk/src/third_party/binutils/Linux_x64/Release/bin -Wheader-hygiene -Wfor-loop-analysis -Wno-char-subscripts -Wno-unneeded-internal-declaration -Wno-covered-switch-default -Wstring-conversion -Wno-c++11-narrowing -Wno-deprecated-register -Wno-inconsistent-missing-override -Wno-shift-negative-value -Wglobal-constructors -Xclang -load -Xclang /home/bysmyyr/crosswalk/src/third_party/llvm-build/Release+Asserts/lib/libBlinkGCPlugin.so -Xclang -add-plugin -Xclang blink-gc-plugin -pthread -I/home/bysmyyr/crosswalk/src/build/linux/debian_wheezy_amd64-sysroot/usr/include/glib-2.0 -I/home/bysmyyr/crosswalk/src/build/linux/debian_wheezy_amd64-sysroot/usr/lib/x86_64-linux-gnu/glib-2.0/include -m64 -march=x86-64 --sysroot=/home/bysmyyr/crosswalk/src/build/linux/debian_wheezy_amd64-sysroot -O2 -fno-ident -fdata-sections -ffunction-sections -funwind-tables -fno-exceptions -fno-rtti -fno-threadsafe-statics -fvisibility-inlines-hidden -std=gnu++11 -c ../../third_party/WebKit/Source/modules/webcl/WebCLKernelArgInfoProvider.cpp -o obj/third_party/WebKit/Source/modules/webcl/modules.WebCLKernelArgInfoProvider.o
../../third_party/WebKit/Source/modules/webcl/WebCLKernelArgInfoProvider.cpp:33:19: error: comparison of unsigned expression >= 0 is always true [-Werror,-Wtautological-compare]
return (start >= 0 && string[start + 1] == '' && string[start] == '');
~~~~~ ^ ~
1 error generated.
[3844/4092] CXX obj/third_party/WebKit/Source/bindings/modules/v8/custom/modules.V8DeviceMotionEventCustom.o
ninja: build stopped: subcommand failed.
`

@Bysmyyr
Copy link
Contributor

Bysmyyr commented Feb 16, 2016

that repush did not change anything?

@shaoboyan
Copy link
Contributor Author

@Bysmyyr No, it changes, since last time it is a compile error which lacks of files . But this time, as you can see, this is a warning error, you can use -DWerror= . However when build webcl on android platfrom with gcc thiis error wouldn't occur. However, I'll fix this warning if you wish

@rakuco
Copy link
Contributor

rakuco commented Feb 16, 2016

Well, the compiler warning/error does point to an actual mistake that should be fixed.

@shaoboyan
Copy link
Contributor Author

@rakuco @Bysmyyr Sorry for the explain about Warning error and as @rakuco said, it is indeed a potential bug. Thx for you guidance. Now the patch is clean without -DWerror= flag.

@shaoboyan shaoboyan force-pushed the XWALK-6200 branch 2 times, most recently from 4080d41 to 45502b8 Compare February 17, 2016 05:41
@hujiajie
Copy link
Contributor

WebCLCommandQueue.cpp calls postTask() too, so theoretically WebTaskRunner.h should be included there for more uniform coding style.

@shaoboyan
Copy link
Contributor Author

@hujiajie done.

@shaoboyan shaoboyan force-pushed the XWALK-6200 branch 2 times, most recently from 0373db5 to 20328b9 Compare February 17, 2016 06:16
@Bysmyyr
Copy link
Contributor

Bysmyyr commented Feb 17, 2016

ok, thanks, lets try

@Bysmyyr
Copy link
Contributor

Bysmyyr commented Feb 17, 2016

@shaoboyan now it builds fine. I will merge after you fix that whitespace

@shaoboyan
Copy link
Contributor Author

@Bysmyyr thx.

Bysmyyr added a commit that referenced this pull request Feb 17, 2016
[Blink] WebCL: Remove config.h and ENABLE_WEBCL.
@Bysmyyr Bysmyyr merged commit cfa6b0c into crosswalk-project:next Feb 17, 2016
@hujiajie
Copy link
Contributor

All C++ changes LGTM, but changes in gyp does not seem to be perfect yet, especially due to the use of modules_idl_files_list.tmp and multiple enable_webcl declarations. I need more time to understand how gyp works before the merge if there's no hurry.

@Bysmyyr
Copy link
Contributor

Bysmyyr commented Feb 17, 2016

make a new pullrequest which reverts those and adds them again fixed when you have something better but use these for now... I will drop those reverts then.

Thanks for everybody for efforts this far

Compile Error

Since upstream removed config.h file from Blink Source dir, WebCL need
to replace "config.h" with "wtf/build_config.h".
This patch also fix some compile error caused by upstream API changes.

BUG=XWALK-6200
Since upstream delete idl extension attribute 'Conditional', WebCL
related idls which depend on it need to be updated.

Now using gyp to control whether enable WebCL and discard ENABLE_WEBCL
macro.

BUG=XWALK-6200
rakuco pushed a commit that referenced this pull request Mar 3, 2016
Removed shownComponentsChanged_() in favor of updateElementPositioning_(). Moved async() method to ensure any microtasks such as first run flow or issue stamping has concluded before the positioning of the WebUI elements is determined.

BUG=583203

Review URL: https://codereview.chromium.org/1652203004

Cr-Commit-Position: refs/heads/master@{#373116}
(cherry picked from commit 75b93c4)

Review URL: https://codereview.chromium.org/1683503002 .

Cr-Commit-Position: refs/branch-heads/2623@{#316}
Cr-Branched-From: 92d7753-refs/heads/master@{#369907}
huningxin pushed a commit to huningxin/chromium-croswalk that referenced this pull request May 17, 2016
…og for Mac.

This change uses an autoresizing dialog for Media Router on Macs rather than a fixed size dialog. Previously, the dialog could only autoresize on Linux and Windows.

The original CL was reverted because it depended on a patch that was reverted. It can be found here: https://codereview.chromium.org/1680533003/

BUG=508544, 580272, 580273

Review URL: https://codereview.chromium.org/1779253003

Cr-Commit-Position: refs/heads/master@{#381128}
(cherry picked from commit d903c98)

Review URL: https://codereview.chromium.org/1820983002 .

Cr-Commit-Position: refs/branch-heads/2661@{crosswalk-project#316}
Cr-Branched-From: ef6f6ae-refs/heads/master@{#378081}
fujunwei pushed a commit to fujunwei/chromium-crosswalk that referenced this pull request May 27, 2016
URL change without document change may create a new entry in
NavigationManager, hence SSL status should be updated for it.

BUG=562024

Review URL: https://codereview.chromium.org/1508253002

Cr-Commit-Position: refs/heads/master@{#363856}
(cherry picked from commit 2b6af83)

Review URL: https://codereview.chromium.org/1517083002 .

Cr-Commit-Position: refs/branch-heads/2564@{crosswalk-project#316}
Cr-Branched-From: 1283eca-refs/heads/master@{#359700}
huningxin pushed a commit to huningxin/chromium-croswalk that referenced this pull request Oct 9, 2016
Added back the missing plumbing. Also added EventSender support to pass stylus
info for testing.

BUG=593850

Review-Url: https://codereview.chromium.org/2043053002
Cr-Commit-Position: refs/heads/master@{#398933}
(cherry picked from commit abca6ff)

Review URL: https://codereview.chromium.org/2054123002 .

Cr-Commit-Position: refs/branch-heads/2743@{crosswalk-project#316}
Cr-Branched-From: 2b3ae3b-refs/heads/master@{#394939}
imreotto pushed a commit to tenta-browser/chromium-crosswalk that referenced this pull request Nov 2, 2017
This reverts commit 267e445.

Reason for revert: We've already seen lots of breakages with PlzNavigate

Original change's description:
> AW: enable PlzNavigate via CLI switch
> 
> This CL enables PlzNavigate (browser side navigation) by default for
> WebView only. This is to try out the new code path before launching at
> 100% for all of chrome.
> 
> [email protected]
> 
> (cherry picked from commit dbc2bb9)
> 
> Bug: 765250
> Test: Manual
> Change-Id: Iff2d0585e11075e71fe196df47503d950e2b26b3
> Reviewed-on: https://chromium-review.googlesource.com/667502
> Reviewed-by: Selim Gurun <[email protected]>
> Commit-Queue: Nate Fischer <[email protected]>
> Cr-Original-Commit-Position: refs/heads/master@{#502121}
> Reviewed-on: https://chromium-review.googlesource.com/671187
> Reviewed-by: Nate Fischer <[email protected]>
> Cr-Commit-Position: refs/branch-heads/3202@{crosswalk-project#300}
> Cr-Branched-From: fa6a5d8-refs/heads/master@{#499098}

[email protected],[email protected]

Change-Id: I173db64902172655a72161a244f3923c9c9ef196
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 765250
Reviewed-on: https://chromium-review.googlesource.com/672156
Reviewed-by: Nate Fischer <[email protected]>
Cr-Commit-Position: refs/branch-heads/3202@{crosswalk-project#316}
Cr-Branched-From: fa6a5d8-refs/heads/master@{#499098}
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants