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

Issue 729693003: First step at getting rid of anonymous blocks and continuations. (Closed)

Created:
6 years, 1 month ago by ojan
Modified:
6 years, 1 month ago
Reviewers:
jamesr, esprehn, eseidel
CC:
abarth-chromium, esprehn, Hixie, mojo-reviews_chromium.org
Base URL:
git@github.com:domokit/mojo.git@master
Project:
mojo
Visibility:
Public.

Description

First step at getting rid of anonymous blocks and continuations. -Add RenderParagraph and display:paragraph. This is the only render type that's allowed to contain inlines or text. -If you put text nodes directly in a non-paragraph, wrap them in an anonymous paragraph. This may not be the place we want to end up, but it's a good stopgap to make it so we don't crash in this case. -Make StyleAdjuster force that non-paragraph blocks only contain RenderBlock subclasses and that paragraphs and inlines only contain inlines. -Considerably simplify addChildIgnoringAnonymousColumnBlocks now that we only create anonymous blocks for the case of text nodes in non-paragraphs. Also get rid of the behavior where we try to group multiple nodes into a single anonymous block. R=esprehn@chromium.org Committed: https://chromium.googlesource.com/external/mojo/+/f8bae4e0a89b2be24df547d35d01ea05580e2ec4

Patch Set 1 #

Patch Set 2 : a little cleanup of dead code #

Patch Set 3 : Rebaseline flights-app.sky #

Total comments: 4

Patch Set 4 : Address review comments #

Unified diffs Side-by-side diffs Delta from patch set Stats (+326 lines, -402 lines) Patch
M sky/engine/core/core.gni View 1 chunk +2 lines, -0 lines 0 comments Download
M sky/engine/core/css/CSSPrimitiveValueMappings.h View 1 2 3 1 chunk +3 lines, -0 lines 0 comments Download
M sky/engine/core/css/CSSValueKeywords.in View 1 chunk +3 lines, -0 lines 0 comments Download
M sky/engine/core/css/resolver/StyleAdjuster.h View 1 chunk +0 lines, -1 line 0 comments Download
M sky/engine/core/css/resolver/StyleAdjuster.cpp View 1 2 3 3 chunks +50 lines, -10 lines 0 comments Download
M sky/engine/core/rendering/RenderBlock.h View 2 chunks +2 lines, -3 lines 0 comments Download
M sky/engine/core/rendering/RenderBlock.cpp View 1 2 3 7 chunks +21 lines, -205 lines 0 comments Download
M sky/engine/core/rendering/RenderBlockFlow.cpp View 1 chunk +0 lines, -1 line 0 comments Download
M sky/engine/core/rendering/RenderBox.cpp View 1 chunk +0 lines, -41 lines 0 comments Download
M sky/engine/core/rendering/RenderObject.h View 1 2 3 3 chunks +4 lines, -2 lines 0 comments Download
M sky/engine/core/rendering/RenderObject.cpp View 1 2 3 3 chunks +6 lines, -11 lines 0 comments Download
A sky/engine/core/rendering/RenderParagraph.h View 1 2 3 1 chunk +29 lines, -0 lines 0 comments Download
A sky/engine/core/rendering/RenderParagraph.cpp View 1 2 3 1 chunk +27 lines, -0 lines 0 comments Download
M sky/engine/core/rendering/style/RenderStyleConstants.h View 1 2 3 1 chunk +1 line, -1 line 0 comments Download
M sky/examples/city-list/city-list.sky View 1 2 3 3 chunks +6 lines, -0 lines 0 comments Download
M sky/tests/framework/flights-app-expected.txt View 1 2 2 chunks +97 lines, -93 lines 0 comments Download
A sky/tests/layout/continuations.sky View 1 chunk +4 lines, -0 lines 0 comments Download
A sky/tests/layout/continuations-expected.txt View 1 chunk +13 lines, -0 lines 0 comments Download
M sky/tests/lowlevel/abarth.sky View 1 chunk +7 lines, -0 lines 0 comments Download
M sky/tests/lowlevel/hello-world-expected.txt View 1 chunk +3 lines, -2 lines 0 comments Download
M sky/tests/lowlevel/iframe-expected.txt View 1 2 3 1 chunk +3 lines, -2 lines 0 comments Download
M sky/tests/lowlevel/scrollbar-expected.txt View 1 chunk +45 lines, -30 lines 0 comments Download

Messages

Total messages: 7 (2 generated)
ojan
There's a couple open questions that can be handled in a followup set of patches: ...
6 years, 1 month ago (2014-11-15 03:47:41 UTC) #2
esprehn
lgtm w/ nits. It looks like you totally busted the flights app? Can you fix ...
6 years, 1 month ago (2014-11-18 00:20:02 UTC) #3
ojan
On 2014/11/18 at 00:20:02, esprehn wrote: > lgtm w/ nits. It looks like you totally ...
6 years, 1 month ago (2014-11-18 02:39:37 UTC) #4
ojan
Committed patchset #4 (id:60001) manually as f8bae4e0a89b2be24df547d35d01ea05580e2ec4.
6 years, 1 month ago (2014-11-18 02:39:57 UTC) #5
jamesr
6 years, 1 month ago (2014-11-18 06:34:58 UTC) #7
Message was sent while issue was closed.
FAILED: /b/build/goma/gomacc
../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++
-MMD -MF obj/sky/engine/core/css/resolver/libsky_core.StyleAdjuster.o.d
-DCHROMIUM_BUILD -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=1
-DENABLE_NOTIFICATIONS -DENABLE_BROWSER_CDMS -DENABLE_PRINTING=1
-DENABLE_BASIC_PRINTING=1 -DUSE_OPENSSL=1 -DUSE_OPENSSL_CERTS=1 -DNO_TCMALLOC
-DDISABLE_NACL -DENABLE_CONFIGURATION_POLICY -DENABLE_MANAGED_USERS=1
-DENABLE_AUTOFILL_DIALOG=1 -D_FILE_OFFSET_BITS=64 -DANDROID -DHAVE_SYS_UIO_H
-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DUSE_STLPORT=1
-D_STLP_USE_PTR_SPECIALIZATIONS=1 -D__GNU_SOURCE=1 -DNDEBUG
-DSK_SUPPORT_LEGACY_TEXTRENDERMODE -DSK_IGNORE_GPU_LAYER_HOISTING
-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
-DSK_BUILD_FOR_ANDROID -DUSE_CHROMIUM_SKIA -DENABLE_OPENTYPE_VERTICAL=1
-DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION
-DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DCHROME_PNG_READ_PACK_SUPPORT
-DBLINK_IMPLEMENTATION=1 -DINSIDE_BLINK -I../.. -Igen
-I../../third_party/khronos -I../../gpu -I../../v8/include -I../../skia/config
-I../../skia/ext -I../../third_party/skia/include/c
-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../../third_party/icu/source/common
-I../../third_party/icu/source/i18n -I../../third_party/angle/include
-I../../third_party/iccjpeg -I../../third_party/libpng -I../../third_party/zlib
-I../../third_party/ots/include -I../../third_party/qcms/src -I../../sky/engine
-Igen/sky -fno-strict-aliasing -march=armv7-a -mfloat-abi=softfp
-mtune=generic-armv7-a -mthumb -mthumb-interwork -fno-tree-sra -fno-caller-saves
-funwind-tables -fPIC -pipe -ffunction-sections -funwind-tables -fno-short-enums
-finline-limit=64 -mfpu=vfpv3-d16 -Wall -Wsign-compare -Wendif-labels -Werror
-Wno-missing-field-initializers -Wno-unused-parameter -Wno-psabi -Wno-extra
-Wno-ignored-qualifiers -Wno-type-limits -Wno-unused-local-typedefs
-isystem../../third_party/android_tools/ndk/sources/cxx-stl/stlport/stlport
-fvisibility=hidden
--sysroot=/b/build/slave/mojo/build/src/third_party/android_tools/ndk/platforms/android-14/arch-arm
-fno-ident -fdata-sections -ffunction-sections -fomit-frame-pointer -Os -g2
-Wno-unused-but-set-variable -fno-threadsafe-statics -fvisibility-inlines-hidden
-std=gnu++11 -Wno-narrowing -Wno-literal-suffix -Wno-error=c++0x-compat
-Wno-non-virtual-dtor -Wno-sign-promo -fno-rtti -fno-exceptions
-Wno-c++0x-compat -c ../../sky/engine/core/css/resolver/StyleAdjuster.cpp -o
obj/sky/engine/core/css/resolver/libsky_core.StyleAdjuster.o
../../sky/engine/core/css/resolver/StyleAdjuster.cpp: In function 'bool
blink::requiresOnlyBlockChildren(blink::RenderStyle*)':
../../sky/engine/core/css/resolver/StyleAdjuster.cpp:61:1: error: control
reaches end of non-void function [-Werror=return-type]
 }
 ^

on the android builders

Powered by Google App Engine
This is Rietveld 408576698