Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(383)

Issue 551463005: Revert of cc: Add occlusion checker as a fixed view of occlusion tracker. (Closed)

Created:
6 years, 3 months ago by Michael Courage
Modified:
6 years, 3 months ago
Reviewers:
danakj, vmpstr
CC:
chromium-reviews, cc-bugs_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Project:
chromium
Visibility:
Public.

Description

Revert of cc: Add occlusion checker as a fixed view of occlusion tracker. (patchset #7 id:120001 of https://codereview.chromium.org/547723002/) Reason for revert: Broke linux GN build: http://build.chromium.org/p/chromium.linux/builders/Linux%20GN/builds/11591 [496/2225 | 35.477] CXX obj/ui/views/controls/views.focusable_border.o [497/2225 | 35.633] CXX obj/ui/views/controls/views.glow_hover_controller.o FAILED: /mnt/data/b/build/goma/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF obj/cc/layers/cc_unittests.picture_layer_impl_unittest.o.d -DCHROMIUM_BUILD -DENABLE_NOTIFICATIONS -DENABLE_EGLIMAGE=1 -DENABLE_BACKGROUND=1 -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -DENABLE_MDNS=1 -DENABLE_PEPPER_CDMS -DENABLE_PLUGINS=1 -DENABLE_PRINTING=1 -DENABLE_FULL_PRINTING=1 -DENABLE_SPELLCHECK=1 -DUSE_UDEV -DTOOLKIT_VIEWS=1 -DUI_COMPOSITOR_IMAGE_TRANSPORT -DUSE_ASH=1 -DUSE_AURA=1 -DUSE_CAIRO=1 -DUSE_CLIPBOARD_AURAX11=1 -DUSE_DEFAULT_RENDER_THEME=1 -DUSE_GLIB=1 -DUSE_NSS=1 -DUSE_X11=1 -DUSE_XI2_MT=2 -DDISABLE_NACL -DENABLE_EXTENSIONS=1 -DENABLE_CONFIGURATION_POLICY -DENABLE_TASK_MANAGER=1 -DENABLE_THEMES=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_APP_LIST=1 -DENABLE_SETTINGS_APP=1 -DENABLE_MANAGED_USERS=1 -DENABLE_SERVICE_DISCOVERY=1 -DENABLE_AUTOFILL_DIALOG=1 -DENABLE_REMOTING=1 -DENABLE_GOOGLE_NOW=1 -DENABLE_ONE_CLICK_SIGNIN -DCR_CLANG_REVISION=214024 -D_FILE_OFFSET_BITS=64 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DGL_GLEXT_PROTOTYPES -DMEDIA_DISABLE_LIBVPX -DSK_SUPPORT_LEGACY_PUBLIC_IMAGEINFO_FIELDS -DSK_IGNORE_PROPER_FRACTIONAL_SCALING -DSK_SUPPORT_LEGACY_PICTURE_CLONE -DSK_IGNORE_ETC1_SUPPORT -DSK_IGNORE_GPU_DITHER -DSK_SUPPORT_LEGACY_IMAGECACHE_NAME -DSK_LEGACY_PICTURE_SIZE_API -DSK_LEGACY_PICTURE_DRAW_API -DSK_ENABLE_INST_COUNT=0 -DGR_GL_CUSTOM_SETUP_HEADER=\"GrGLConfig_chrome.h\" -DSK_ENABLE_LEGACY_API_ALIASING=1 -DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1 -DGR_GL_IGNORE_ES3_MSAA=0 -DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT -DSK_SUPPORT_LEGACY_GETTOTALCLIP -DSK_SUPPORT_GPU=1 -DSK_USE_POSIX_THREADS -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 -DGTEST_HAS_RTTI=0 -DUNIT_TEST -I../.. -Igen -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I../../third_party/khronos -I../../gpu -Igen/ui/gl -I../../skia/config -I../../skia/ext -I../../third_party/skia/include/config -I../../third_party/skia/include/core -I../../third_party/skia/include/effects -I../../third_party/skia/include/images -I../../third_party/skia/include/lazy -I../../third_party/skia/include/pathops -I../../third_party/skia/include/pdf -I../../third_party/skia/include/pipe -I../../third_party/skia/include/ports -I../../third_party/skia/include/utils -I../../third_party/skia/src/core -I../../third_party/skia/src/image -I../../third_party/skia/src/opts -I../../third_party/skia/src/ports -I../../third_party/skia/src/sfnt -I../../third_party/skia/src/utils -I../../third_party/skia/src/lazy -I../../third_party/skia/include/gpu -I../../third_party/skia/src/gpu -I../../testing/gtest/include -I../../testing/gmock/include -fno-strict-aliasing -fstack-protector --param=ssp-buffer-size=4 -m64 -funwind-tables -fPIC -pipe -pthread -fcolor-diagnostics -Wall -Wextra -Wsign-compare -Wendif-labels -Werror -Wno-missing-field-initializers -Wno-unused-parameter -Wno-c++11-narrowing -Wno-char-subscripts -Wno-covered-switch-default -Wno-deprecated-register -Wno-unused-function -fvisibility=hidden -Xclang -load -Xclang ../../third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.so -Xclang -add-plugin -Xclang find-bad-constructs -Wheader-hygiene -Wstring-conversion -fno-ident -fdata-sections -ffunction-sections -O2 -g2 -fno-threadsafe-statics -fvisibility-inlines-hidden -std=gnu++11 -Wno-reserved-user-defined-literal -fno-rtti -fno-exceptions -c ../../cc/layers/picture_layer_impl_unittest.cc -o obj/cc/layers/cc_unittests.picture_layer_impl_unittest.o ../../cc/layers/picture_layer_impl_unittest.cc:2578:31:error: reference to type 'const cc::Occlusion' could not bind to an rvalue of type 'long' pending_layer_->UpdateTiles(NULL); ^~~~ /mnt/data/b/build/slave/Linux_GN/build/src/third_party/llvm-build/Release+Asserts/bin/../lib/clang/3.5.0/include/stddef.h:96:18: note: expanded from macro 'NULL' # define NULL __null ^~~~~~ ../../cc/layers/picture_layer_impl.h:113:24: note: passing argument to parameter 'occlusion_in_content_space' here const Occlusion& occlusion_in_content_space) OVERRIDE; ^ ../../cc/layers/picture_layer_impl_unittest.cc:2608:31:error: reference to type 'const cc::Occlusion' could not bind to an rvalue of type 'long' pending_layer_->UpdateTiles(NULL); ^~~~ /mnt/data/b/build/slave/Linux_GN/build/src/third_party/llvm-build/Release+Asserts/bin/../lib/clang/3.5.0/include/stddef.h:96:18: note: expanded from macro 'NULL' # define NULL __null ^~~~~~ ../../cc/layers/picture_layer_impl.h:113:24: note: passing argument to parameter 'occlusion_in_content_space' here const Occlusion& occlusion_in_content_space) OVERRIDE; ^ 2 errors generated. ninja: build stopped: subcommand failed. Original issue's description: > cc: Add occlusion checker as a fixed view of occlusion tracker. > > This patch adds an occlusion checker to get the state of > occlusion tracker for permanent checks. That is, occlusion > checker does not have to be queried during a layer walk. > > BUG=410932 > R=danakj > > Committed: https://crrev.com/1af780529157c94a9e0f05bcf478543b85714f6b > Cr-Commit-Position: refs/heads/master@{#294205} TBR=danakj@chromium.org,vmpstr@chromium.org NOTREECHECKS=true NOTRY=true BUG=410932 Committed: https://crrev.com/b84165fd869bf3d7e3637beb24412e39216ce29c Cr-Commit-Position: refs/heads/master@{#294209}

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+294 lines, -225 lines) Patch
M cc/BUILD.gn View 1 chunk +0 lines, -2 lines 0 comments Download
M cc/cc.gyp View 1 chunk +0 lines, -2 lines 0 comments Download
M cc/layers/layer_impl.h View 2 chunks +2 lines, -2 lines 0 comments Download
M cc/layers/picture_image_layer_impl_unittest.cc View 1 chunk +1 line, -1 line 0 comments Download
M cc/layers/picture_layer_impl.h View 2 chunks +3 lines, -2 lines 0 comments Download
M cc/layers/picture_layer_impl.cc View 4 chunks +13 lines, -5 lines 0 comments Download
M cc/layers/picture_layer_impl_unittest.cc View 8 chunks +8 lines, -8 lines 0 comments Download
M cc/resources/picture_layer_tiling.h View 3 chunks +10 lines, -6 lines 0 comments Download
M cc/resources/picture_layer_tiling.cc View 3 chunks +14 lines, -5 lines 0 comments Download
M cc/resources/picture_layer_tiling_perftest.cc View 6 chunks +18 lines, -8 lines 0 comments Download
M cc/resources/picture_layer_tiling_unittest.cc View 29 chunks +133 lines, -54 lines 0 comments Download
M cc/resources/tile_manager_perftest.cc View 5 chunks +5 lines, -5 lines 0 comments Download
M cc/resources/tile_manager_unittest.cc View 3 chunks +84 lines, -12 lines 0 comments Download
M cc/trees/layer_tree_impl.cc View 2 chunks +3 lines, -8 lines 0 comments Download
D cc/trees/occlusion.h View 1 chunk +0 lines, -36 lines 0 comments Download
D cc/trees/occlusion.cc View 1 chunk +0 lines, -48 lines 0 comments Download
M cc/trees/occlusion_tracker.h View 2 chunks +0 lines, -6 lines 0 comments Download
M cc/trees/occlusion_tracker.cc View 1 chunk +0 lines, -10 lines 0 comments Download
M cc/trees/occlusion_tracker_unittest.cc View 1 chunk +0 lines, -5 lines 0 comments Download

Messages

Total messages: 6 (0 generated)
Michael Courage
Created Revert of cc: Add occlusion checker as a fixed view of occlusion tracker.
6 years, 3 months ago (2014-09-10 19:31:09 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/courage@chromium.org/551463005/1
6 years, 3 months ago (2014-09-10 19:33:19 UTC) #2
commit-bot: I haz the power
Committed patchset #1 (id:1) as 91395c5f1f13c426277c51f0b6bca3572b54141d
6 years, 3 months ago (2014-09-10 19:36:03 UTC) #3
commit-bot: I haz the power
Patchset 1 (id:??) landed as https://crrev.com/b84165fd869bf3d7e3637beb24412e39216ce29c Cr-Commit-Position: refs/heads/master@{#294209}
6 years, 3 months ago (2014-09-10 19:38:24 UTC) #4
danakj
Ah missed some tests, or rebase needed. ../../cc/layers/picture_layer_impl_unittest.cc:2578:31:error: reference to type 'const cc::Occlusion' could not ...
6 years, 3 months ago (2014-09-10 19:38:39 UTC) #5
vmpstr
6 years, 3 months ago (2014-09-10 22:50:06 UTC) #6
Message was sent while issue was closed.
On 2014/09/10 19:38:39, danakj wrote:
> Ah missed some tests, or rebase needed.
> 

Just unfortunate timing:

Here's the patch that introduced the new UpdateTiles(NULL):

commit 2451de626227435026a3dcd83c8035baa2bf55d2
Author: e.hakkinen <e.hakkinen@samsung.com>
Date:   Wed Sep 10 10:55:55 2014 -0700

Here's the patch that replaced all NULL with Occlusion():

commit 1af780529157c94a9e0f05bcf478543b85714f6b
Author: vmpstr <vmpstr@chromium.org>
Date:   Wed Sep 10 12:06:45 2014 -0700

1 hour and 11 minutes difference, but trybots all passed already :) I should've
probably spotted new UpdateTiles when I reviewed the patch :\

Powered by Google App Engine
This is Rietveld 408576698