Title: [184548] releases/WebKitGTK/webkit-2.4/Source/WebCore
- Revision
- 184548
- Author
- [email protected]
- Date
- 2015-05-18 23:30:29 -0700 (Mon, 18 May 2015)
Log Message
[W32] Compile-time assertion failure: RenderBlock_should_stay_small
https://bugs.webkit.org/show_bug.cgi?id=143760
Patch by Руслан Ижбулатов <[email protected]> on 2015-04-15
Reviewed by Carlos Garcia Campos.
Move enum LineLayoutPath in RenderBlock
This removes the bitfield interruption, allowing more efficient
packing.
Otherwise compile-time assertion fails:
In file included from ../webkitgtk-2.4.8/Source/WTF/wtf/PossiblyNull.h:29:0,
from ../webkitgtk-2.4.8/Source/WTF/wtf/FastMalloc.h:27,
from ../webkitgtk-2.4.8/Source/WebCore/config.h:74,
from ../webkitgtk-2.4.8/Source/WebCore/rendering/RenderBlock.cpp:24:
../webkitgtk-2.4.8/Source/WTF/wtf/Assertions.h:326:35: error: static assertion failed: RenderBlock_should_stay_small
^
../webkitgtk-2.4.8/Source/WebCore/rendering/RenderBlock.cpp:88:1: note: in expansion of macro 'COMPILE_ASSERT'
COMPILE_ASSERT(sizeof(RenderBlock) == sizeof(SameSizeAsRenderBlock), RenderBlock_should_stay_small);
^
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (184547 => 184548)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2015-05-19 06:24:58 UTC (rev 184547)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2015-05-19 06:30:29 UTC (rev 184548)
@@ -1,5 +1,28 @@
2015-04-15 Руслан Ижбулатов <[email protected]>
+ [W32] Compile-time assertion failure: RenderBlock_should_stay_small
+ https://bugs.webkit.org/show_bug.cgi?id=143760
+
+ Reviewed by Carlos Garcia Campos.
+
+ Move enum LineLayoutPath in RenderBlock
+
+ This removes the bitfield interruption, allowing more efficient
+ packing.
+ Otherwise compile-time assertion fails:
+ In file included from ../webkitgtk-2.4.8/Source/WTF/wtf/PossiblyNull.h:29:0,
+ from ../webkitgtk-2.4.8/Source/WTF/wtf/FastMalloc.h:27,
+ from ../webkitgtk-2.4.8/Source/WebCore/config.h:74,
+ from ../webkitgtk-2.4.8/Source/WebCore/rendering/RenderBlock.cpp:24:
+ ../webkitgtk-2.4.8/Source/WTF/wtf/Assertions.h:326:35: error: static assertion failed: RenderBlock_should_stay_small
+ #define COMPILE_ASSERT(exp, name) static_assert((exp), #name)
+ ^
+ ../webkitgtk-2.4.8/Source/WebCore/rendering/RenderBlock.cpp:88:1: note: in expansion of macro 'COMPILE_ASSERT'
+ COMPILE_ASSERT(sizeof(RenderBlock) == sizeof(SameSizeAsRenderBlock), RenderBlock_should_stay_small);
+ ^
+
+2015-04-15 Руслан Ижбулатов <[email protected]>
+
[W32] GraphicsContextCairoWin.cpp fails to compile: unallowed function template partial specialization
https://bugs.webkit.org/show_bug.cgi?id=143761
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/rendering/RenderBlock.h (184547 => 184548)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/rendering/RenderBlock.h 2015-05-19 06:24:58 UTC (rev 184547)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/rendering/RenderBlock.h 2015-05-19 06:30:29 UTC (rev 184548)
@@ -611,8 +611,8 @@
unsigned m_beingDestroyed : 1;
unsigned m_hasMarkupTruncation : 1;
unsigned m_hasBorderOrPaddingLogicalWidthChanged : 1;
+ unsigned m_lineLayoutPath : 2;
enum LineLayoutPath { UndeterminedPath, SimpleLinesPath, LineBoxesPath, ForceLineBoxesPath };
- unsigned m_lineLayoutPath : 2;
// RenderRubyBase objects need to be able to split and merge, moving their children around
// (calling moveChildTo, moveAllChildrenTo, and makeChildrenNonInline).
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
