diff options
Diffstat (limited to 'Source/WebKit2/Shared')
4 files changed, 6 insertions, 2 deletions
diff --git a/Source/WebKit2/Shared/API/c/WKNumber.h b/Source/WebKit2/Shared/API/c/WKNumber.h index 1b07bef8b..c8c912965 100644 --- a/Source/WebKit2/Shared/API/c/WKNumber.h +++ b/Source/WebKit2/Shared/API/c/WKNumber.h @@ -45,7 +45,7 @@ WK_EXPORT double WKDoubleGetValue(WKDoubleRef doubleRef); /* WKUInt64 */ WK_EXPORT WKTypeID WKUInt64GetTypeID(); WK_EXPORT WKUInt64Ref WKUInt64Create(uint64_t value); -WK_EXPORT uint64_t WKUInt64GetValue(WKUInt64Ref doubleRef); +WK_EXPORT uint64_t WKUInt64GetValue(WKUInt64Ref integerRef); #ifdef __cplusplus } diff --git a/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp b/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp index 8d3950a4c..1a0a52c41 100644 --- a/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp +++ b/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp @@ -47,6 +47,7 @@ void PluginProcessCreationParameters::encode(CoreIPC::ArgumentEncoder* encoder) #if PLATFORM(MAC) encoder->encode(parentProcessName); encoder->encode(acceleratedCompositingPort); + encoder->encode(sandboxProfileDirectoryPath); #endif } @@ -65,6 +66,8 @@ bool PluginProcessCreationParameters::decode(CoreIPC::ArgumentDecoder* decoder, return false; if (!decoder->decode(result.acceleratedCompositingPort)) return false; + if (!decoder->decode(result.sandboxProfileDirectoryPath)) + return false; #endif return true; diff --git a/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h b/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h index 1d6d2e09c..544374ad1 100644 --- a/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h +++ b/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h @@ -56,6 +56,7 @@ struct PluginProcessCreationParameters { #if PLATFORM(MAC) String parentProcessName; CoreIPC::MachPort acceleratedCompositingPort; + String sandboxProfileDirectoryPath; #endif }; diff --git a/Source/WebKit2/Shared/efl/WebEventFactory.cpp b/Source/WebKit2/Shared/efl/WebEventFactory.cpp index 6e50ed199..2b0d951cb 100644 --- a/Source/WebKit2/Shared/efl/WebEventFactory.cpp +++ b/Source/WebKit2/Shared/efl/WebEventFactory.cpp @@ -234,7 +234,7 @@ WebTouchEvent WebEventFactory::createWebTouchEvent(Ewk_Touch_Event_Type type, co break; default: ASSERT_NOT_REACHED(); - break; + continue; } touchPoints.append(WebPlatformTouchPoint(point->id, state, IntPoint(point->x, point->y), IntPoint(point->x - position->x, point->y - position->y))); |