Commit Graph

7092 Commits

Author SHA1 Message Date
Gijs Kruitbosch
5d3ed7cf58 Merge m-c to UX 2013-10-01 00:36:26 +02:00
Gijs Kruitbosch
07d7d08613 Merge mozilla-central and ux 2013-09-30 19:26:47 +02:00
Ed Morley
e9e5ecef9d Merge mozilla-central and b2g-inbound 2013-09-30 17:20:26 +01:00
Matt Woodrow
c0acca2662 Bug 886999 - Backout c3a044164b5f for causing deadlocks (Bug 920979) 2013-09-30 14:31:50 +13:00
Gijs Kruitbosch
2ee145a16d Merge mozilla-central and ux 2013-09-29 11:56:48 +02:00
Gijs Kruitbosch
aa719d2b2d Merge mozilla-central and ux 2013-09-28 09:59:15 +02:00
Gijs Kruitbosch
9e33d5ecaa Merge mozilla-central and ux 2013-09-26 14:48:36 +02:00
Gijs Kruitbosch
495e7495d1 Merge mozilla-central and ux 2013-09-26 10:26:16 +02:00
Ryan VanderMeulen
fb2d6dc1a4 Backed out 6 changesets (bug 913985) for suspicion of causing intermittent Android crashes on a CLOSED TREE.
Backed out changeset de21920d2b8e (bug 913985)
Backed out changeset f0f5497d65bb (bug 913985)
Backed out changeset 1e16ca4ad801 (bug 913985)
Backed out changeset 9c069a0820ea (bug 913985)
Backed out changeset 274df3abc991 (bug 913985)
Backed out changeset 05fe8b17516a (bug 913985)

--HG--
rename : build/annotationProcessors/AnnotationInfo.java => build/annotationProcessors/MethodWithAnnotationInfo.java
rename : build/annotationProcessors/utils/AlphabeticAnnotatableEntityComparator.java => build/annotationProcessors/utils/AlphabeticMethodComparator.java
rename : build/annotationProcessors/utils/GeneratableElementIterator.java => build/annotationProcessors/utils/GeneratableEntryPointIterator.java
rename : mobile/android/base/mozglue/generatorannotations/WrapElementForJNI.java => mobile/android/base/mozglue/GeneratableAndroidBridgeTarget.java
rename : mobile/android/base/mozglue/generatorannotations/OptionalGeneratedParameter.java => mobile/android/base/mozglue/OptionalGeneratedParameter.java
2013-09-27 17:02:09 -04:00
Birunthan Mohanathas
540fd83836 Bug 783333 - Use WM_WINDOWPOSCHANGING instead of WM_MOVE to handle window moves in nsWindow. r=jimm 2013-09-27 14:46:59 -04:00
Gijs Kruitbosch
a3a29ecf94 Merge mozilla-central and ux 2013-09-25 10:16:54 +02:00
Matt Woodrow
65d13c22ac Bug 886999 - Avoid touching the GL context from the main thread on mac, and lock the context when touching it from other threads. r=mstange 2013-09-26 15:49:59 +12:00
Wes Kocher
9f40060dc3 Merge fx-team to m-c 2013-09-24 20:06:37 -07:00
Wes Kocher
14feace5a6 Merge b2g-i to m-c 2013-09-24 19:58:09 -07:00
Michael Wu
018725e24b Bug 914776 - Fix touch event coordinates when rotated, r=m1 2013-09-24 14:58:58 -07:00
Benoit Jacob
e290c5a16a Bug 919219 - fix the windows build - no review, bustage CLOSED TREE 2013-09-24 17:50:37 -04:00
Jim Mathies
02b7eb7b85 Bug 918937 - Fix for buggy long tap - pass intermediate touch data to the gesture recognizer regardless of whether the base touch point has moved. r=bbondy 2013-09-24 16:17:27 -05:00
Jim Mathies
a774def610 Bug 915213 - Transform all gecko input through the apzc via widget to compensate for zoom. r=bbondy 2013-09-24 16:17:26 -05:00
Matt Brubeck
f7fd3eb3ec Bug 891056 - Remove unused code from widget/windows/winrt [r=bbondy] 2013-09-24 13:16:35 -07:00
Michael Wu
e0bf783168 Bug 919845 - Really make Fira Sans the default font, r=jfkthame 2013-09-24 10:57:25 -07:00
Gijs Kruitbosch
1a37a1de38 Merge mozilla-central and ux 2013-09-24 14:55:03 +02:00
Masayuki Nakano
648570f10b Bug 912956 part.18 Remove nsGUIEvent.h r=roc 2013-09-25 20:21:22 +09:00
Masayuki Nakano
ad647cc182 Bug 912956 part.17 mozilla/ContentEvents.h should be included directly r=roc 2013-09-25 20:21:20 +09:00
Masayuki Nakano
64fa96e1ce Bug 912956 part.16 mozilla/MiscEvents.h should be included directly r=roc 2013-09-25 20:21:20 +09:00
Masayuki Nakano
d37d273b83 Bug 912956 part.15 mozilla/TextEvents.h should be included directly r=roc 2013-09-25 20:21:19 +09:00
Masayuki Nakano
f827f4667b Bug 912956 part.14 mozilla/MouseEvents.h should be included directly r=roc 2013-09-25 20:21:18 +09:00
Masayuki Nakano
8d69a172c1 Bug 912956 part.13 mozilla/TouchEvents.h should be included directly r=roc 2013-09-25 20:21:16 +09:00
Benoit Jacob
6ac61cabdb Bug 913872 - Take nested enums out of gfxASurface - 3/3 : remove the now-useless inclusions of gfxASurface.h - r=jrmuizel 2013-09-24 16:45:14 -04:00
Benoit Jacob
1eebb52b07 Bug 913872 - Take nested enums out of gfxASurface - 2/3 : manual changes - r=jrmuizel 2013-09-24 16:45:14 -04:00
Benoit Jacob
c1d7f88886 Bug 913872 - Take nested enums out of gfxASurface - 1/3 : automatic changes - r=jrmuizel
Generated by these regexes:

find . -name '*.h' -o -name '*.cpp' -o -name '*.mm' | grep -v '\.hg' | grep -v '^\.\/obj' | xargs sed -i 's/gfx[A-Za-z0-9_]*Surface\:\:[a-z]*\(\(ImageFormat\|SurfaceType\|ContentType\|MemoryLocation\)[0-9A-Za-z_]*\)/gfx\1/g'

find . -name '*.h' -o -name '*.cpp' -o -name '*.mm' | grep -v '\.hg' | grep -v '^\.\/obj' | xargs sed -i 's/gfx[A-Za-z0-9_]*Surface\:\:[a-z]*\(\(CONTENT_\|MEMORY_\)[0-9A-Za-z_]*\)/GFX_\1/g'

find . -name '*.h' -o -name '*.cpp' -o -name '*.mm' | grep -v '\.hg' | grep -v '^\.\/obj' | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)\(CONTENT_COLOR\|CONTENT_ALPHA\|CONTENT_COLOR_ALPHA\|CONTENT_SENTINEL\|MEMORY_IN_PROCESS_HEAP\|MEMORY_IN_PROCESS_NONHEAP\|MEMORY_OUT_OF_PROCESS\)\($\|[^A-Za-z0-9_]\)/\1GFX_\2\3/g'

find . -name '*.h' -o -name '*.cpp' -o -name '*.mm' | grep -v '\.hg' | grep -v '^\.\/obj' | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)\(ImageFormatARGB32\|ImageFormatRGB24\|ImageFormatA8\|ImageFormatA1\|ImageFormatRGB16_565\|ImageFormatUnknown\|SurfaceTypeImage\|SurfaceTypePDF\|SurfaceTypePS\|SurfaceTypeXlib\|SurfaceTypeXcb\|SurfaceTypeGlitz\|SurfaceTypeQuartz\|SurfaceTypeWin32\|SurfaceTypeBeOS\|SurfaceTypeDirectFB\|SurfaceTypeSVG\|SurfaceTypeOS2\|SurfaceTypeWin32Printing\|SurfaceTypeQuartzImage\|SurfaceTypeScript\|SurfaceTypeQPainter\|SurfaceTypeRecording\|SurfaceTypeVG\|SurfaceTypeGL\|SurfaceTypeDRM\|SurfaceTypeTee\|SurfaceTypeXML\|SurfaceTypeSkia\|SurfaceTypeSubsurface\|SurfaceTypeD2D\|SurfaceTypeMax\)\($\|[^A-Za-z0-9_]\)/\1gfx\2\3/g'
2013-09-24 16:45:13 -04:00
Benoit Jacob
610684a101 Bug 919219 - Trim gfxASurface more - r=jrmuizel 2013-09-24 16:45:13 -04:00
Benoit Jacob
890a165b57 Bug 919219 - Split nsMainThreadSurfaceRef out of gfxASurface.h, into ImageContainer.h - r=jrmuizel 2013-09-24 16:45:13 -04:00
Ryan VanderMeulen
a053c4c09f Merge m-c to inbound.
--HG--
rename : widget/gtk2/nsGtkIMModule.cpp => widget/gtk/nsGtkIMModule.cpp
2013-09-23 17:10:33 -04:00
Ryan VanderMeulen
fdd42a380a Merge inbound to m-c. 2013-09-23 17:01:29 -04:00
Ryan VanderMeulen
bacbe638ce Merge fx-team to m-c. 2013-09-23 17:00:26 -04:00
Ryan VanderMeulen
87e2f5b745 Merge b2g-inbound to m-c. 2013-09-23 16:57:55 -04:00
Benoit Girard
62e5d6c0fe Bug 918942 - Add label in DrawWindowOverlay to diagnose potential ANR dead locks. r=jmuizelaar 2013-09-23 09:33:31 -04:00
Martin Stransky
c53988803d Bug 917270 - Rename widget/gtk2 to widget/gtk. r=karlt
--HG--
rename : widget/gtk2/Makefile.in => widget/gtk/Makefile.in
rename : widget/gtk2/WidgetTraceEvent.cpp => widget/gtk/WidgetTraceEvent.cpp
rename : widget/gtk2/compat/gdk/gdkdnd.h => widget/gtk/compat/gdk/gdkdnd.h
rename : widget/gtk2/compat/gdk/gdkkeysyms.h => widget/gtk/compat/gdk/gdkkeysyms.h
rename : widget/gtk2/compat/gdk/gdkvisual.h => widget/gtk/compat/gdk/gdkvisual.h
rename : widget/gtk2/compat/gdk/gdkwindow.h => widget/gtk/compat/gdk/gdkwindow.h
rename : widget/gtk2/compat/gdk/gdkx.h => widget/gtk/compat/gdk/gdkx.h
rename : widget/gtk2/compat/glib/gmem.h => widget/gtk/compat/glib/gmem.h
rename : widget/gtk2/compat/gtk/gtkcolorseldialog.h => widget/gtk/compat/gtk/gtkcolorseldialog.h
rename : widget/gtk2/compat/gtk/gtkdialog.h => widget/gtk/compat/gtk/gtkdialog.h
rename : widget/gtk2/compat/gtk/gtkplug.h => widget/gtk/compat/gtk/gtkplug.h
rename : widget/gtk2/compat/gtk/gtkselection.h => widget/gtk/compat/gtk/gtkselection.h
rename : widget/gtk2/compat/gtk/gtkwidget.h => widget/gtk/compat/gtk/gtkwidget.h
rename : widget/gtk2/compat/gtk/gtkwindow.h => widget/gtk/compat/gtk/gtkwindow.h
rename : widget/gtk2/crashtests/673390-1.html => widget/gtk/crashtests/673390-1.html
rename : widget/gtk2/crashtests/crashtests.list => widget/gtk/crashtests/crashtests.list
rename : widget/gtk2/gtk2drawing.c => widget/gtk/gtk2drawing.c
rename : widget/gtk2/gtk3drawing.c => widget/gtk/gtk3drawing.c
rename : widget/gtk2/gtkdrawing.h => widget/gtk/gtkdrawing.h
rename : widget/gtk2/maiRedundantObjectFactory.c => widget/gtk/maiRedundantObjectFactory.c
rename : widget/gtk2/maiRedundantObjectFactory.h => widget/gtk/maiRedundantObjectFactory.h
rename : widget/gtk2/moz.build => widget/gtk/moz.build
rename : widget/gtk2/mozcontainer.c => widget/gtk/mozcontainer.c
rename : widget/gtk2/mozcontainer.h => widget/gtk/mozcontainer.h
rename : widget/gtk2/nsAppShell.cpp => widget/gtk/nsAppShell.cpp
rename : widget/gtk2/nsAppShell.h => widget/gtk/nsAppShell.h
rename : widget/gtk2/nsBidiKeyboard.cpp => widget/gtk/nsBidiKeyboard.cpp
rename : widget/gtk2/nsBidiKeyboard.h => widget/gtk/nsBidiKeyboard.h
rename : widget/gtk2/nsCUPSShim.cpp => widget/gtk/nsCUPSShim.cpp
rename : widget/gtk2/nsCUPSShim.h => widget/gtk/nsCUPSShim.h
rename : widget/gtk2/nsClipboard.cpp => widget/gtk/nsClipboard.cpp
rename : widget/gtk2/nsClipboard.h => widget/gtk/nsClipboard.h
rename : widget/gtk2/nsColorPicker.cpp => widget/gtk/nsColorPicker.cpp
rename : widget/gtk2/nsColorPicker.h => widget/gtk/nsColorPicker.h
rename : widget/gtk2/nsDeviceContextSpecG.cpp => widget/gtk/nsDeviceContextSpecG.cpp
rename : widget/gtk2/nsDeviceContextSpecG.h => widget/gtk/nsDeviceContextSpecG.h
rename : widget/gtk2/nsDragService.cpp => widget/gtk/nsDragService.cpp
rename : widget/gtk2/nsDragService.h => widget/gtk/nsDragService.h
rename : widget/gtk2/nsFilePicker.cpp => widget/gtk/nsFilePicker.cpp
rename : widget/gtk2/nsFilePicker.h => widget/gtk/nsFilePicker.h
rename : widget/gtk2/nsGTKToolkit.h => widget/gtk/nsGTKToolkit.h
rename : widget/gtk2/nsGtkCursors.h => widget/gtk/nsGtkCursors.h
rename : widget/gtk2/nsGtkIMModule.cpp => widget/gtk/nsGtkIMModule.cpp
rename : widget/gtk2/nsGtkIMModule.h => widget/gtk/nsGtkIMModule.h
rename : widget/gtk2/nsGtkKeyUtils.cpp => widget/gtk/nsGtkKeyUtils.cpp
rename : widget/gtk2/nsGtkKeyUtils.h => widget/gtk/nsGtkKeyUtils.h
rename : widget/gtk2/nsGtkUtils.h => widget/gtk/nsGtkUtils.h
rename : widget/gtk2/nsIImageToPixbuf.h => widget/gtk/nsIImageToPixbuf.h
rename : widget/gtk2/nsIdleServiceGTK.cpp => widget/gtk/nsIdleServiceGTK.cpp
rename : widget/gtk2/nsIdleServiceGTK.h => widget/gtk/nsIdleServiceGTK.h
rename : widget/gtk2/nsImageToPixbuf.cpp => widget/gtk/nsImageToPixbuf.cpp
rename : widget/gtk2/nsImageToPixbuf.h => widget/gtk/nsImageToPixbuf.h
rename : widget/gtk2/nsLookAndFeel.cpp => widget/gtk/nsLookAndFeel.cpp
rename : widget/gtk2/nsLookAndFeel.h => widget/gtk/nsLookAndFeel.h
rename : widget/gtk2/nsNativeKeyBindings.cpp => widget/gtk/nsNativeKeyBindings.cpp
rename : widget/gtk2/nsNativeKeyBindings.h => widget/gtk/nsNativeKeyBindings.h
rename : widget/gtk2/nsNativeThemeGTK.cpp => widget/gtk/nsNativeThemeGTK.cpp
rename : widget/gtk2/nsNativeThemeGTK.h => widget/gtk/nsNativeThemeGTK.h
rename : widget/gtk2/nsPSPrinters.cpp => widget/gtk/nsPSPrinters.cpp
rename : widget/gtk2/nsPSPrinters.h => widget/gtk/nsPSPrinters.h
rename : widget/gtk2/nsPaperPS.cpp => widget/gtk/nsPaperPS.cpp
rename : widget/gtk2/nsPaperPS.h => widget/gtk/nsPaperPS.h
rename : widget/gtk2/nsPrintDialogGTK.cpp => widget/gtk/nsPrintDialogGTK.cpp
rename : widget/gtk2/nsPrintDialogGTK.h => widget/gtk/nsPrintDialogGTK.h
rename : widget/gtk2/nsPrintOptionsGTK.cpp => widget/gtk/nsPrintOptionsGTK.cpp
rename : widget/gtk2/nsPrintOptionsGTK.h => widget/gtk/nsPrintOptionsGTK.h
rename : widget/gtk2/nsPrintSettingsGTK.cpp => widget/gtk/nsPrintSettingsGTK.cpp
rename : widget/gtk2/nsPrintSettingsGTK.h => widget/gtk/nsPrintSettingsGTK.h
rename : widget/gtk2/nsScreenGtk.cpp => widget/gtk/nsScreenGtk.cpp
rename : widget/gtk2/nsScreenGtk.h => widget/gtk/nsScreenGtk.h
rename : widget/gtk2/nsScreenManagerGtk.cpp => widget/gtk/nsScreenManagerGtk.cpp
rename : widget/gtk2/nsScreenManagerGtk.h => widget/gtk/nsScreenManagerGtk.h
rename : widget/gtk2/nsSound.cpp => widget/gtk/nsSound.cpp
rename : widget/gtk2/nsSound.h => widget/gtk/nsSound.h
rename : widget/gtk2/nsToolkit.cpp => widget/gtk/nsToolkit.cpp
rename : widget/gtk2/nsWidgetFactory.cpp => widget/gtk/nsWidgetFactory.cpp
rename : widget/gtk2/nsWindow.cpp => widget/gtk/nsWindow.cpp
rename : widget/gtk2/nsWindow.h => widget/gtk/nsWindow.h
2013-09-23 09:21:57 -04:00
Martin Stransky
3a0ac880b9 Bug 914607 - Remove MOZ_WIDGET_GTK2. r=karlt 2013-09-23 09:21:35 -04:00
Vincent Lin
7931d10a49 Bug 914554 - Remove a redundant GraphicBufferAlloc.cpp from B2G. r=mwu 2013-09-18 10:04:03 +08:00
Ehsan Akhgari
276e4b787c Bug 919341 - Minimize the #includes in xpcom/ IDL files; r=bsmedberg 2013-09-23 13:29:27 -04:00
Ehsan Akhgari
b4cc06df88 Bug 918923 - Part 2: Switch to #including nsString.h in code using the internal strings API; r=bsmedberg 2013-09-23 13:25:00 -04:00
Gijs Kruitbosch
6a4e83eb90 Merge mozilla-central and ux 2013-09-23 17:59:41 +02:00
Gijs Kruitbosch
8ed9c0d44e Merge mozilla-central and ux 2013-09-21 13:14:05 +02:00
Gijs Kruitbosch
d52551e57b Merge mozilla-central and ux 2013-09-20 11:54:02 +02:00
Anthony Jones
d2c862bc9e Bug 740200 - Azure support in nsWindow; r=mattwoodrow 2013-09-20 14:00:35 +12:00
Gijs Kruitbosch
c78ba896a4 Merge m-c to UX
--HG--
rename : browser/base/content/test/Makefile.in => browser/base/content/test/general/Makefile.in
rename : browser/base/content/test/browser_bug462289.js => browser/base/content/test/general/browser_bug462289.js
rename : browser/base/content/test/browser_bug624734.js => browser/base/content/test/general/browser_bug624734.js
rename : browser/base/content/test/head.js => browser/base/content/test/general/head.js
2013-09-19 17:15:24 +02:00
Gijs Kruitbosch
fc6c455c77 Merge mozilla-central and ux 2013-09-19 09:09:59 +02:00
Phil Ringnalda
39df442f56 Merge m-c to m-i 2013-09-18 23:28:41 -07:00
Phil Ringnalda
aa84227374 Backed out 10 changesets (bug 907926, bug 911393, bug 740200, bug 917703) for b2g build bustage
CLOSED TREE

Backed out changeset ae02054863f7 (bug 907926)
Backed out changeset 8fcdbbc2dac2 (bug 917703)
Backed out changeset aa253a1fd7e5 (bug 911393)
Backed out changeset ec63e6d6d874 (bug 907926)
Backed out changeset 0042a2722aab (bug 907926)
Backed out changeset dc8bddfca5f1 (bug 740200)
Backed out changeset 439ff7e64d35 (bug 740200)
Backed out changeset d871c0d61510 (bug 740200)
Backed out changeset 3b248c5a0dc2 (bug 740200)
Backed out changeset 3466e81d3a41 (bug 740200)
2013-09-18 23:08:41 -07:00