Title: [169980] trunk/Source/WebCore
- Revision
- 169980
- Author
- [email protected]
- Date
- 2014-06-14 13:57:44 -0700 (Sat, 14 Jun 2014)
Log Message
Fix the ARM64 build
* cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::SelectorCodeGenerator::addFlagsToElementStyleFromContext):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (169979 => 169980)
--- trunk/Source/WebCore/ChangeLog 2014-06-14 20:38:45 UTC (rev 169979)
+++ trunk/Source/WebCore/ChangeLog 2014-06-14 20:57:44 UTC (rev 169980)
@@ -1,3 +1,10 @@
+2014-06-14 Benjamin Poulain <[email protected]>
+
+ Fix the ARM64 build
+
+ * cssjit/SelectorCompiler.cpp:
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::addFlagsToElementStyleFromContext):
+
2014-06-13 Sam Weinig <[email protected]>
Store DOM constants directly in the JS object rather than jumping through a custom accessor
Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (169979 => 169980)
--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-06-14 20:38:45 UTC (rev 169979)
+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-06-14 20:57:44 UTC (rev 169980)
@@ -1387,13 +1387,13 @@
LocalRegister childStyle(m_registerAllocator);
m_assembler.loadPtr(Assembler::Address(checkingContext, OBJECT_OFFSETOF(CheckingContext, elementStyle)), childStyle);
+ // FIXME: We should look into doing something smart in MacroAssembler instead.
Assembler::Address flagAddress(childStyle, RenderStyle::noninheritedFlagsMemoryOffset() + RenderStyle::NonInheritedFlags::flagsMemoryOffset());
#if CPU(ARM_THUMB2)
Assembler::Address flagLowAddress(childStyle, RenderStyle::noninheritedFlagsMemoryOffset() + RenderStyle::NonInheritedFlags::flagsMemoryOffset() + 4);
m_assembler.or32(Assembler::TrustedImm32(newFlag >> 32), flagAddress);
m_assembler.or32(Assembler::TrustedImm32(newFlag & 0xFFFFFFFF), flagLowAddress);
-#elif CPU(X86_64) || CPU(ARM)
- // FIXME: We should look into doing something smart in MacroAssembler instead.
+#elif CPU(X86_64) || CPU(ARM64)
LocalRegister flags(m_registerAllocator);
m_assembler.load64(flagAddress, flags);
LocalRegister isFirstChildStateFlagImmediate(m_registerAllocator);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
