[CSS Shapes] clamp RasterShape shapeMargin to reference box size

[CSS Shapes] clamp RasterShape shapeMargin to reference box size

Verify that a very large shape-margin value combined with a very small
shape-outside image defines a shape that matches the shape-outside
element's margin-box.

This is a merge of http://trac.webkit.org/changeset/166019 by
Hans Muller <hmuller@adobe.com>;.

BUG=354917
Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=169768

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=169877

[rwlbuis, 2014-03-21 17:57:12]

Straightforward port.

[Hans Muller, 2014-03-21 18:02:26]

On 2014/03/21 17:57:12, rwlbuis wrote:
> Straightforward port.

Other than the -webkit-font-smoothing lines in the test, this patch looks good
to me.

[rwlbuis, 2014-03-21 18:03:02]

A fresh fix from WebKit :)

[pdr., 2014-03-21 18:08:28]

On 2014/03/21 18:03:02, rwlbuis wrote:
> A fresh fix from WebKit :)

LGTM but please include the author's name in the change description. I like to
use the following template:

This is a merge of http://trac.webkit.org/changeset/166019 by Hans Muller
<hmuller@adobe.com>.

[rwlbuis, 2014-03-21 18:38:43]

On 2014/03/21 18:08:28, pdr wrote:
> On 2014/03/21 18:03:02, rwlbuis wrote:
> > A fresh fix from WebKit :)
> 
> LGTM but please include the author's name in the change description. I like to
> use the following template:
> 
> This is a merge of http://trac.webkit.org/changeset/166019 by Hans Muller
> <mailto:hmuller@adobe.com>.

You are right, you can figure the author from the trac link but it is better to
state it in the commit message. Will fix, thanks!

[rwlbuis, 2014-03-21 18:40:12]

The CQ bit was checked by rob.buis@samsung.com

[commit-bot: I haz the power, 2014-03-21 18:40:16]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/rob.buis@samsung.com/208423003/1

[commit-bot: I haz the power, 2014-03-21 19:48:42]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-21 19:48:43]

Try jobs failed on following builders:
  tryserver.blink on linux_blink_dbg

[rwlbuis, 2014-03-21 19:53:58]

The CQ bit was checked by rob.buis@samsung.com

[commit-bot: I haz the power, 2014-03-21 19:54:06]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/rob.buis@samsung.com/208423003/1

[commit-bot: I haz the power, 2014-03-21 20:54:32]

Change committed as 169768

[eae, 2014-03-22 00:10:28]

On 2014/03/21 20:54:32, I haz the power (commit-bot) wrote:
> Change committed as 169768


This change broke the android bot [1]:
FAILED: /mnt/data/b/build/goma/gomacc
/mnt/data/b/build/slave/Android_Builder/build/src/third_party/android_tools/ndk//toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++
-MMD -MF
obj/third_party/WebKit/Source/core/rendering/shapes/webcore_rendering.RasterShape.o.d
-DV8_DEPRECATION_WARNINGS -DBLINK_SCALE_FILTERS_AT_RECORD_TIME
-D_FILE_OFFSET_BITS=64 -DNO_TCMALLOC -DDISABLE_NACL -DCHROMIUM_BUILD
-DUSE_LIBJPEG_TURBO=1 -DENABLE_WEBRTC=1 -DUSE_PROPRIETARY_CODECS
-DENABLE_CONFIGURATION_POLICY -DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY
-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE -DENABLE_EGLIMAGE=1
-DENABLE_AUTOFILL_DIALOG=1 -DCLD_VERSION=1 -DENABLE_PRINTING=1
-DENABLE_MANAGED_USERS=1 -DBLINK_IMPLEMENTATION=1 -DINSIDE_BLINK
-DENABLE_CUSTOM_SCHEME_HANDLER=0 -DENABLE_SVG_FONTS=1
-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1 -DENABLE_FAST_MOBILE_SCROLLING=1
-DENABLE_INPUT_SPEECH=0 -DENABLE_MEDIA_CAPTURE=1
-DWTF_USE_WEBAUDIO_OPENMAX_DL_FFT=1 -DENABLE_WEB_AUDIO=1
-DENABLE_OPENTYPE_VERTICAL=1 -DU_USING_ICU_NAMESPACE=0 -DU_STATIC_IMPLEMENTATION
-DSK_ENABLE_INST_COUNT=0 -DSK_SUPPORT_GPU=1
'-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_SUPPORT_LEGACY_LAYERRASTERIZER_API=1
-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT
-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1
-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1
-DSK_SUPPORT_LEGACY_READPIXELSCONFIG -DSK_SUPPORT_LEGACY_GETCLIPTYPE
-DSK_SUPPORT_LEGACY_GETTOTALCLIP -DSK_SUPPORT_LEGACY_GETTOPDEVICE
-DSK_BUILD_FOR_ANDROID -DSK_USE_POSIX_THREADS
-DSK_DEFERRED_CANVAS_USES_FACTORIES=1 -DCHROME_PNG_WRITE_SUPPORT
-DPNG_USER_CONFIG -DCHROME_PNG_READ_PACK_SUPPORT -DLIBXML_STATIC
-DLIBXSLT_STATIC -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS
-DANDROID -D__GNU_SOURCE=1 -DUSE_STLPORT=1 -D_STLP_USE_PTR_SPECIALIZATIONS=1
'-DCHROME_BUILD_ID=""' -DHAVE_SYS_UIO_H -DNDEBUG -DNVALGRIND
-DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_FORTIFY_SOURCE=2
-I../../third_party/WebKit/Source -I../.. -I../../skia/config
-I../../third_party/khronos -I../../gpu -I../../third_party/WebKit -Igen/blink
-Igen/blink/bindings -I../../third_party/openmax_dl
-I../../third_party/angle/include -I../../third_party/icu/source/i18n
-I../../third_party/icu/source/common -I../../third_party/skia/src/core
-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/iccjpeg -I../../third_party/libpng
-I../../third_party/libwebp -I../../third_party/libxml/linux/include
-I../../third_party/libxml/src/include -I../../third_party/libxslt
-I../../third_party/npapi -I../../third_party/npapi/bindings
-I../../third_party/ots/include -I../../third_party/qcms/src
-I../../third_party/sqlite -I../../third_party/zlib -I../../v8/include
-fstack-protector --param=ssp-buffer-size=4 -Werror -fno-exceptions
-fno-strict-aliasing -Wall -Wno-unused-parameter -Wno-missing-field-initializers
-fvisibility=hidden -pipe -fPIC -march=armv7-a -mfpu=vfpv3-d16
-mfloat-abi=softfp -mthumb -fno-tree-sra -fuse-ld=gold -Wno-psabi
-mthumb-interwork -ffunction-sections -funwind-tables -g -fstack-protector
-fno-short-enums -finline-limit=64 -Wa,--noexecstack
--sysroot=/mnt/data/b/build/slave/Android_Builder/build/src/third_party/android_tools/ndk//platforms/android-14/arch-arm
-I/mnt/data/b/build/slave/Android_Builder/build/src/third_party/android_tools/ndk//sources/cxx-stl/stlport/stlport
-Os -fno-ident -fdata-sections -ffunction-sections -fomit-frame-pointer
-funwind-tables -g1 -fno-rtti -fno-threadsafe-statics
-fvisibility-inlines-hidden -Wsign-compare -Wno-c++0x-compat -Wno-abi  -c
../../third_party/WebKit/Source/core/rendering/shapes/RasterShape.cpp -o
obj/third_party/WebKit/Source/core/rendering/shapes/webcore_rendering.RasterShape.o
../../third_party/WebKit/Source/core/rendering/shapes/RasterShape.cpp: In member
function 'const WebCore::RasterShapeIntervals&
WebCore::RasterShape::marginIntervals() const':
../../third_party/WebKit/Source/core/rendering/shapes/RasterShape.cpp:259:99:
error: call of overloaded 'sqrt(int)' is ambiguous
../../third_party/WebKit/Source/core/rendering/shapes/RasterShape.cpp:259:99:
note: candidates are:
/mnt/data/b/build/slave/Android_Builder/build/src/third_party/android_tools/ndk//platforms/android-14/arch-arm/usr/include/../include/math.h:223:8:
note: double sqrt(double)
/mnt/data/b/build/slave/Android_Builder/build/src/third_party/android_tools/ndk//sources/cxx-stl/stlport/stlport/stl/_cmath.h:450:1:
note: float sqrt(float)
/mnt/data/b/build/slave/Android_Builder/build/src/third_party/android_tools/ndk//sources/cxx-stl/stlport/stlport/stl/_cmath.h:450:1:
note: long double sqrt(long double)
ninja: build stopped: subcommand failed.


1:
http://build.chromium.org/p/chromium.webkit/builders/Android%20Builder/builds...

[rwlbuis, 2014-03-24 15:28:07]

The CQ bit was checked by rob.buis@samsung.com

[commit-bot: I haz the power, 2014-03-24 15:28:16]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/rob.buis@samsung.com/208423003/20001

[commit-bot: I haz the power, 2014-03-24 15:29:31]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-24 15:29:31]

Try jobs failed on following builders:
  tryserver.blink on mac_blink_rel

[rwlbuis, 2014-03-24 15:35:34]

The CQ bit was checked by rob.buis@samsung.com

[commit-bot: I haz the power, 2014-03-24 15:35:39]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/rob.buis@samsung.com/208423003/20001

[commit-bot: I haz the power, 2014-03-24 16:36:15]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-24 16:36:15]

Try jobs failed on following builders:
  tryserver.blink on linux_blink_dbg

[rwlbuis, 2014-03-24 17:06:27]

The CQ bit was checked by rob.buis@samsung.com

[commit-bot: I haz the power, 2014-03-24 17:06:32]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/rob.buis@samsung.com/208423003/20001

[commit-bot: I haz the power, 2014-03-24 18:10:50]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-24 18:10:50]

Try jobs failed on following builders:
  tryserver.blink on linux_blink_dbg

[rwlbuis, 2014-03-24 18:17:15]

The CQ bit was checked by rob.buis@samsung.com

[commit-bot: I haz the power, 2014-03-24 18:17:18]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/rob.buis@samsung.com/208423003/20001

[commit-bot: I haz the power, 2014-03-24 19:16:58]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-24 19:16:59]

Try jobs failed on following builders:
  tryserver.blink on linux_blink_dbg

[rwlbuis, 2014-03-24 20:12:08]

The CQ bit was checked by rob.buis@samsung.com

[commit-bot: I haz the power, 2014-03-24 20:12:16]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/rob.buis@samsung.com/208423003/20001

[commit-bot: I haz the power, 2014-03-24 21:50:07]

Change committed as 169877