diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp | 4 | ||||
| -rw-r--r-- | Source/JavaScriptCore/jit/JITStubs.h | 6 | ||||
| -rw-r--r-- | Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 10 | ||||
| -rw-r--r-- | Source/WebCore/dom/DOMImplementation.cpp | 6 | ||||
| -rw-r--r-- | Source/WebCore/page/DOMWindow.cpp | 2 | ||||
| -rw-r--r-- | Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp | 2 |
6 files changed, 13 insertions, 17 deletions
diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp b/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp index 0264361b5..6fc08bcb3 100644 --- a/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp +++ b/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp @@ -47,6 +47,10 @@ namespace JSC { static bool isVFPPresent() { +#if defined(__SOFTFP__) + return false; +#endif + #if OS(LINUX) int fd = open("/proc/self/auxv", O_RDONLY); if (fd > 0) { diff --git a/Source/JavaScriptCore/jit/JITStubs.h b/Source/JavaScriptCore/jit/JITStubs.h index 2659d6899..ad7ecc851 100644 --- a/Source/JavaScriptCore/jit/JITStubs.h +++ b/Source/JavaScriptCore/jit/JITStubs.h @@ -143,7 +143,7 @@ struct JITStackFrame { #if COMPILER(MSVC) || (OS(WINDOWS) && COMPILER(GCC)) || OS(QNX) #pragma pack(push) #pragma pack(4) -#endif // COMPILER(MSVC) || (OS(WINDOWS) && COMPILER(GCC)) +#endif // COMPILER(MSVC) || (OS(WINDOWS) && COMPILER(GCC)) || OS(QNX) struct JITStackFrame { void* reserved; // Unused JITStubArg args[6]; @@ -167,9 +167,9 @@ struct JITStackFrame { // When JIT code makes a call, it pushes its return address just below the rest of the stack. ReturnAddressPtr* returnAddressSlot() { return reinterpret_cast<ReturnAddressPtr*>(this) - 1; } }; -#if COMPILER(MSVC) || (OS(WINDOWS) && COMPILER(GCC)) +#if COMPILER(MSVC) || (OS(WINDOWS) && COMPILER(GCC)) || OS(QNX) #pragma pack(pop) -#endif // COMPILER(MSVC) || (OS(WINDOWS) && COMPILER(GCC)) +#endif // COMPILER(MSVC) || (OS(WINDOWS) && COMPILER(GCC)) || OS(QNX) #elif CPU(ARM_THUMB2) struct JITStackFrame { JITStubArg reserved; // Unused diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp index a616ce9f0..c8f7254a4 100644 --- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp @@ -530,19 +530,11 @@ JSValue CLoop::execute(CallFrame* callFrame, OpcodeID bootstrapOpcodeId, #define OFFLINE_ASM_OPCODE_LABEL(__opcode) OFFLINE_ASM_GLOBAL_LABEL(llint_##__opcode) #define OFFLINE_ASM_GLUE_LABEL(__opcode) OFFLINE_ASM_GLOBAL_LABEL(__opcode) -#if CPU(ARM_THUMB2) -#define OFFLINE_ASM_GLOBAL_LABEL(label) \ - ".globl " SYMBOL_STRING(label) "\n" \ - HIDE_SYMBOL(label) "\n" \ - ".thumb\n" \ - ".thumb_func " THUMB_FUNC_PARAM(label) "\n" \ - SYMBOL_STRING(label) ":\n" -#else #define OFFLINE_ASM_GLOBAL_LABEL(label) \ ".globl " SYMBOL_STRING(label) "\n" \ HIDE_SYMBOL(label) "\n" \ + INLINE_ARM_FUNCTION(label) \ SYMBOL_STRING(label) ":\n" -#endif #define OFFLINE_ASM_LOCAL_LABEL(label) LOCAL_LABEL_STRING(label) ":\n" diff --git a/Source/WebCore/dom/DOMImplementation.cpp b/Source/WebCore/dom/DOMImplementation.cpp index 59bb5aa5a..794433e3f 100644 --- a/Source/WebCore/dom/DOMImplementation.cpp +++ b/Source/WebCore/dom/DOMImplementation.cpp @@ -405,10 +405,10 @@ PassRefPtr<Document> DOMImplementation::createDocument(const String& type, Frame PluginData* pluginData = 0; PluginData::AllowedPluginTypes allowedPluginTypes = PluginData::OnlyApplicationPlugins; if (frame && frame->page()) { - if (frame->loader()->subframeLoader()->allowPlugins(NotAboutToInstantiatePlugin)) + if (frame->loader()->subframeLoader()->allowPlugins(NotAboutToInstantiatePlugin)) { allowedPluginTypes = PluginData::AllPlugins; - - pluginData = frame->page()->pluginData(); + pluginData = frame->page()->pluginData(); + } } // PDF is one image type for which a plugin can override built-in support. diff --git a/Source/WebCore/page/DOMWindow.cpp b/Source/WebCore/page/DOMWindow.cpp index 5b0664f00..670191f41 100644 --- a/Source/WebCore/page/DOMWindow.cpp +++ b/Source/WebCore/page/DOMWindow.cpp @@ -1811,7 +1811,7 @@ void DOMWindow::setLocation(const String& urlString, DOMWindow* activeWindow, DO return; KURL completedURL = firstFrame->document()->completeURL(urlString); - if (completedURL.isNull()) + if (completedURL.isNull() || !completedURL.isValid()) return; if (isInsecureScriptAccess(activeWindow, completedURL)) diff --git a/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp b/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp index 22eba69cd..db3994667 100644 --- a/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp +++ b/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp @@ -248,7 +248,7 @@ void QStyleFacadeImp::paintButton(QPainter* painter, QStyleFacade::ButtonType ty QWidget* widget = qobject_cast<QWidget*>(widgetForPainter(painter)); MappedStyleOption<QStyleOptionButton> option(widget, proxyOption); - if (m_style->inherits("QWindowsVistaStyle")) + if (m_style->inherits("QWindowsVistaStyle") || QApplication::style()->inherits("QWindowsVistaStyle")) option.styleObject = 0; if (type == PushButton) |