Imported WebKit commit 30997fb33975697a4af9cc6eef69967313d0ec9a

Change-Id: I8a2348dd9eb59df840dde6b66141d562aff29bf4
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>

7 files changed, 30 insertions, 30 deletions

diff --git a/Source/WebCore/PlatformQt.cmake b/Source/WebCore/PlatformQt.cmake
index 0661364c5..3b9e36bef 100644
--- a/Source/WebCore/PlatformQt.cmake
+++ b/Source/WebCore/PlatformQt.cmake
@@ -413,20 +413,14 @@ if (MSVC)
         "${WEBCORE_DIR}/ForwardingHeaders"
         "${WEBCORE_DIR}/platform/win"
     )
+endif ()
 
-    file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore)
-
-    set(WebCore_PRE_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebCore/preBuild.cmd")
-    file(WRITE "${WebCore_PRE_BUILD_COMMAND}" "@xcopy /y /s /d /f \"${WEBCORE_DIR}/ForwardingHeaders/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore\" >nul 2>nul\n")
-    foreach (_directory ${WebCore_FORWARDING_HEADERS_DIRECTORIES})
-        file(APPEND "${WebCore_PRE_BUILD_COMMAND}" "@xcopy /y /d /f \"${WEBCORE_DIR}/${_directory}/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore\" >nul 2>nul\n")
-    endforeach ()
-    foreach (_file ${WebCore_FORWARDING_HEADERS_FILES})
-        file(APPEND "${WebCore_PRE_BUILD_COMMAND}" "@xcopy /y /d /f \"${WEBCORE_DIR}/${_file}\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore\" >nul 2>nul\n")
-    endforeach ()
+if (APPLE)
+    list(APPEND WebCore_SOURCES
+        platform/VNodeTracker.cpp
 
-    set(WebCore_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebCore/postBuild.cmd")
-    file(WRITE "${WebCore_POST_BUILD_COMMAND}" "@xcopy /y /s /d /f \"${DERIVED_SOURCES_WEBCORE_DIR}/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore\" >nul 2>nul\n")
+        platform/cf/SharedBufferCF.cpp
+    )
 endif ()
 
 # From PlatformEfl.cmake
diff --git a/Source/WebCore/platform/FileSystem.h b/Source/WebCore/platform/FileSystem.h
index 8dc360dc2..f3844b8df 100644
--- a/Source/WebCore/platform/FileSystem.h
+++ b/Source/WebCore/platform/FileSystem.h
@@ -49,7 +49,7 @@
 #endif
 #endif
 
-#if USE(CF) || (PLATFORM(QT) && defined(Q_WS_MAC))
+#if USE(CF) || (PLATFORM(QT) && defined(Q_OS_MAC))
 typedef struct __CFBundle* CFBundleRef;
 typedef const struct __CFData* CFDataRef;
 #endif
@@ -75,7 +75,7 @@ typedef HMODULE PlatformModule;
 #elif PLATFORM(EFL)
 typedef Eina_Module* PlatformModule;
 #elif PLATFORM(QT)
-#if defined(Q_WS_MAC)
+#if defined(Q_OS_MAC)
 typedef CFBundleRef PlatformModule;
 #elif !defined(QT_NO_LIBRARY)
 typedef QLibrary* PlatformModule;
diff --git a/Source/WebCore/platform/audio/SincResampler.cpp b/Source/WebCore/platform/audio/SincResampler.cpp
index 9a9c54677..d27ac19ea 100644
--- a/Source/WebCore/platform/audio/SincResampler.cpp
+++ b/Source/WebCore/platform/audio/SincResampler.cpp
@@ -35,7 +35,7 @@
 #include "AudioBus.h"
 #include <wtf/MathExtras.h>
 
-#ifdef __SSE2__
+#if CPU(X86_SSE2)
 #include <emmintrin.h>
 #endif
 
@@ -260,7 +260,7 @@ void SincResampler::process(AudioSourceProvider* sourceProvider, float* destinat
             {
                 float input;
 
-#ifdef __SSE2__
+#if CPU(X86_SSE2)
                 // If the sourceP address is not 16-byte aligned, the first several frames (at most three) should be processed seperately.
                 while ((reinterpret_cast<uintptr_t>(inputP) & 0x0F) && n) {
                     CONVOLVE_ONE_SAMPLE
diff --git a/Source/WebCore/platform/audio/VectorMath.cpp b/Source/WebCore/platform/audio/VectorMath.cpp
index f308e0312..7e8d44f3d 100644
--- a/Source/WebCore/platform/audio/VectorMath.cpp
+++ b/Source/WebCore/platform/audio/VectorMath.cpp
@@ -32,7 +32,7 @@
 #include <Accelerate/Accelerate.h>
 #endif
 
-#ifdef __SSE2__
+#if CPU(X86_SSE2)
 #include <emmintrin.h>
 #endif
 
@@ -134,7 +134,7 @@ void vsma(const float* sourceP, int sourceStride, const float* scale, float* des
 {
     int n = framesToProcess;
 
-#ifdef __SSE2__
+#if CPU(X86_SSE2)
     if ((sourceStride == 1) && (destStride == 1)) {
         float k = *scale;
 
@@ -207,7 +207,7 @@ void vsmul(const float* sourceP, int sourceStride, const float* scale, float* de
 {
     int n = framesToProcess;
 
-#ifdef __SSE2__
+#if CPU(X86_SSE2)
     if ((sourceStride == 1) && (destStride == 1)) {
         float k = *scale;
 
@@ -278,7 +278,7 @@ void vsmul(const float* sourceP, int sourceStride, const float* scale, float* de
         sourceP += sourceStride;
         destP += destStride;
     }
-#ifdef __SSE2__
+#if CPU(X86_SSE2)
     }
 #endif
 }
@@ -287,7 +287,7 @@ void vadd(const float* source1P, int sourceStride1, const float* source2P, int s
 {
     int n = framesToProcess;
 
-#ifdef __SSE2__
+#if CPU(X86_SSE2)
     if ((sourceStride1 ==1) && (sourceStride2 == 1) && (destStride == 1)) {
         // If the sourceP address is not 16-byte aligned, the first several frames (at most three) should be processed separately.
         while ((reinterpret_cast<size_t>(source1P) & 0x0F) && n) {
@@ -390,7 +390,7 @@ void vadd(const float* source1P, int sourceStride1, const float* source2P, int s
         source2P += sourceStride2;
         destP += destStride;
     }
-#ifdef __SSE2__
+#if CPU(X86_SSE2)
     }
 #endif
 }
@@ -400,7 +400,7 @@ void vmul(const float* source1P, int sourceStride1, const float* source2P, int s
 
     int n = framesToProcess;
 
-#ifdef __SSE2__
+#if CPU(X86_SSE2)
     if ((sourceStride1 == 1) && (sourceStride2 == 1) && (destStride == 1)) {
         // If the source1P address is not 16-byte aligned, the first several frames (at most three) should be processed separately.
         while ((reinterpret_cast<uintptr_t>(source1P) & 0x0F) && n) {
@@ -473,7 +473,7 @@ void vmul(const float* source1P, int sourceStride1, const float* source2P, int s
 void zvmul(const float* real1P, const float* imag1P, const float* real2P, const float* imag2P, float* realDestP, float* imagDestP, size_t framesToProcess)
 {
     unsigned i = 0;
-#ifdef __SSE2__
+#if CPU(X86_SSE2)
     // Only use the SSE optimization in the very common case that all addresses are 16-byte aligned. 
     // Otherwise, fall through to the scalar code below.
     if (!(reinterpret_cast<uintptr_t>(real1P) & 0x0F)
@@ -531,7 +531,7 @@ void vsvesq(const float* sourceP, int sourceStride, float* sumP, size_t framesTo
     int n = framesToProcess;
     float sum = 0;
 
-#ifdef __SSE2__ 
+#if CPU(X86_SSE2)
     if (sourceStride == 1) { 
         // If the sourceP address is not 16-byte aligned, the first several frames (at most three) should be processed separately. 
         while ((reinterpret_cast<uintptr_t>(sourceP) & 0x0F) && n) { 
@@ -596,7 +596,7 @@ void vmaxmgv(const float* sourceP, int sourceStride, float* maxP, size_t framesT
     int n = framesToProcess;
     float max = 0;
 
-#ifdef __SSE2__
+#if CPU(X86_SSE2)
     if (sourceStride == 1) {
         // If the sourceP address is not 16-byte aligned, the first several frames (at most three) should be processed separately.
         while ((reinterpret_cast<uintptr_t>(sourceP) & 0x0F) && n) {
diff --git a/Source/WebCore/platform/qt/FileSystemQt.cpp b/Source/WebCore/platform/qt/FileSystemQt.cpp
index 97be786d4..363029406 100644
--- a/Source/WebCore/platform/qt/FileSystemQt.cpp
+++ b/Source/WebCore/platform/qt/FileSystemQt.cpp
@@ -251,7 +251,7 @@ int writeToFile(PlatformFileHandle handle, const char* data, int length)
 
 bool unloadModule(PlatformModule module)
 {
-#if defined(Q_WS_MAC)
+#if defined(Q_OS_MAC)
     CFRelease(module);
     return true;
 
diff --git a/Source/WebCore/platform/qt/RenderThemeQStyle.cpp b/Source/WebCore/platform/qt/RenderThemeQStyle.cpp
index b9c6953fa..7373acca7 100644
--- a/Source/WebCore/platform/qt/RenderThemeQStyle.cpp
+++ b/Source/WebCore/platform/qt/RenderThemeQStyle.cpp
@@ -136,7 +136,7 @@ RenderThemeQStyle::RenderThemeQStyle(Page* page)
 {
     int buttonPixelSize = 0;
     m_qStyle->getButtonMetrics(&m_buttonFontFamily, &buttonPixelSize);
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     m_buttonFontPixelSize = buttonPixelSize;
 #endif
 }
@@ -294,7 +294,7 @@ void RenderThemeQStyle::adjustButtonStyle(StyleResolver& styleResolver, RenderSt
     // Ditch the border.
     style.resetBorder();
 
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     if (style.appearance() == PushButtonPart) {
         // The Mac ports ignore the specified height for <input type="button"> elements
         // unless a border and/or background CSS property is also specified.
@@ -305,7 +305,7 @@ void RenderThemeQStyle::adjustButtonStyle(StyleResolver& styleResolver, RenderSt
     FontCascadeDescription fontDescription = style.fontDescription();
     fontDescription.setIsAbsoluteSize(true);
 
-#ifdef Q_WS_MAC // Use fixed font size and family on Mac (like Safari does)
+#ifdef Q_OS_MAC // Use fixed font size and family on Mac (like Safari does)
     fontDescription.setSpecifiedSize(m_buttonFontPixelSize);
     fontDescription.setComputedSize(m_buttonFontPixelSize);
 #else
@@ -607,6 +607,11 @@ ControlPart RenderThemeQStyle::initializeCommonQStyleOptions(QStyleFacadeOption
     option.state &= ~(QStyleFacade::State_HasFocus | QStyleFacade::State_MouseOver);
     option.state |= QStyleFacade::State_Enabled;
 
+#ifdef Q_OS_MAC
+    // to render controls in correct positions we also should set the State_Active flag
+    option.state |= QStyleFacade::State_Active;
+#endif
+
     if (isReadOnlyControl(o))
         // Readonly is supported on textfields.
         option.state |= QStyleFacade::State_ReadOnly;
diff --git a/Source/WebCore/rendering/SimpleLineLayout.cpp b/Source/WebCore/rendering/SimpleLineLayout.cpp
index f35f61465..9a2ef6a18 100644
--- a/Source/WebCore/rendering/SimpleLineLayout.cpp
+++ b/Source/WebCore/rendering/SimpleLineLayout.cpp
@@ -532,6 +532,7 @@ public:
     }
 
     bool operator!=(const FragmentForwardIterator& other) const { return m_fragmentIndex != other.m_fragmentIndex; }
+    bool operator==(const FragmentForwardIterator& other) const { return m_fragmentIndex == other.m_fragmentIndex; }
     unsigned operator*() const { return m_fragmentIndex; }
 
 private: