changeset 4246:64ece25b039f

RT-31450: Merge with Webkit master (svn revision r150795) win64, scroll fix
author Alexey Utkin <alexey.utkin@oracle.com>
date Tue, 09 Jul 2013 15:40:19 +0400
parents b85884d0523e
children c0b912353269
files modules/web/src/main/native/Source/JavaScriptCore/TargetJava.pri modules/web/src/main/native/Source/WebCore/DerivedSourcesJava.pri modules/web/src/main/native/Source/WebCore/platform/java/ScrollbarThemeJava.cpp modules/web/src/main/native/Source/WebCore/platform/java/ScrollbarThemeJava.h
diffstat 4 files changed, 8 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/modules/web/src/main/native/Source/JavaScriptCore/TargetJava.pri	Tue Jul 09 14:02:00 2013 +0400
+++ b/modules/web/src/main/native/Source/JavaScriptCore/TargetJava.pri	Tue Jul 09 15:40:19 2013 +0400
@@ -345,9 +345,8 @@
 }
 
 win32-* {
-    procarch = $$(PROCESSOR_ARCHITECTURE)
-    procw6432 = $$(PROCESSOR_ARCHITEW6432)
-    contains(procarch, AMD64) | contains(procw6432, AMD64) {
+    procarch = $$(PROCESSOR_ARCHITECTURE) $$(PROCESSOR_ARCHITEW6432)
+    contains(procarch, AMD64) {
         ASM_SOURCES += $$PWD/jit/JITStubsMSVC64.asm
 
         asm_compiler.CONFIG = target_predeps
--- a/modules/web/src/main/native/Source/WebCore/DerivedSourcesJava.pri	Tue Jul 09 14:02:00 2013 +0400
+++ b/modules/web/src/main/native/Source/WebCore/DerivedSourcesJava.pri	Tue Jul 09 15:40:19 2013 +0400
@@ -1018,7 +1018,7 @@
                --include $$PWD/Modules/filesystem \
                --include $$PWD/Modules/geolocation \
                --include $$PWD/Modules/indexeddb \
-               --include $$PWD/Modules/mediasource \
+#              --include $$PWD/Modules/mediasource \
                --include $$PWD/Modules/notifications \
                --include $$PWD/Modules/quota \
                --include $$PWD/Modules/webaudio \
@@ -1064,7 +1064,7 @@
                --include $$PWD/Modules/filesystem \
                --include $$PWD/Modules/geolocation \
                --include $$PWD/Modules/indexeddb \
-               --include $$PWD/Modules/mediasource \
+#              --include $$PWD/Modules/mediasource \
                --include $$PWD/Modules/notifications \
                --include $$PWD/Modules/quota \
                --include $$PWD/Modules/webaudio \
--- a/modules/web/src/main/native/Source/WebCore/platform/java/ScrollbarThemeJava.cpp	Tue Jul 09 14:02:00 2013 +0400
+++ b/modules/web/src/main/native/Source/WebCore/platform/java/ScrollbarThemeJava.cpp	Tue Jul 09 15:40:19 2013 +0400
@@ -112,7 +112,7 @@
     return false;
 }
 
-ScrollbarPart ScrollbarThemeJava::hitTest(ScrollbarThemeClient* scrollbar, const PlatformMouseEvent& evt)
+ScrollbarPart ScrollbarThemeJava::hitTest(ScrollbarThemeClient* scrollbar, const IntPoint& pos)
 {
     JLObject jtheme = getJScrollBarTheme(scrollbar);
     if (!jtheme) {
@@ -126,7 +126,7 @@
         "(IIIIIIII)I");
     ASSERT(mid);
 
-    IntPoint p = scrollbar->convertFromContainingWindow(evt.position());
+    IntPoint p = scrollbar->convertFromContainingWindow(pos);
     int part = env->CallIntMethod(
         jtheme,
         mid,
--- a/modules/web/src/main/native/Source/WebCore/platform/java/ScrollbarThemeJava.h	Tue Jul 09 14:02:00 2013 +0400
+++ b/modules/web/src/main/native/Source/WebCore/platform/java/ScrollbarThemeJava.h	Tue Jul 09 15:40:19 2013 +0400
@@ -12,9 +12,9 @@
 
 class ScrollbarThemeJava : public ScrollbarTheme {
 public:
-    virtual bool paint(ScrollbarThemeClient*, GraphicsContext*, const IntRect& damageRect);
+    virtual bool paint(ScrollbarThemeClient*, GraphicsContext*, const IntRect& /*damageRect*/);
 
-    virtual ScrollbarPart hitTest(ScrollbarThemeClient*, const PlatformMouseEvent&);
+    virtual ScrollbarPart hitTest(ScrollbarThemeClient*, const IntPoint&);
 
     virtual void invalidatePart(ScrollbarThemeClient*, ScrollbarPart);