Commit Graph

1841 Commits

Author SHA1 Message Date
Jason Duell
1b0fefc8aa Merged again from m-c to get latest bits and avoid deleted branch issue. 2010-06-22 17:57:09 -07:00
Jason Duell
d194b9d486 Merge from m-c.
Fair amount of merge conflicts.

Biggest item was changes to nsHttpChannel from web sockets changes.

Other likely suspects if things are borken:

nsFrameLoader.cpp:
    - nsFrameLoader::EnsureMessageManager: pass "this" (orig e10s code) or
      nsnull (m-c) to local process call to new nsFrameMessageManager(),
      callback arg?  Smaug said null.
    - only calling SetCallBackData for local case.  also +r smaug.

nsPrefBranch.cpp had fairly extensive merge conflicts.

nsChromeRegistry had lots of changes.

Dougt did most of the non-necko changes (thanks).

--HG--
rename : netwerk/protocol/http/nsHttpChannel.cpp => netwerk/protocol/http/nsHttpChannelAuthProvider.cpp
rename : netwerk/protocol/http/nsHttpChannel.h => netwerk/protocol/http/nsHttpChannelAuthProvider.h
2010-06-22 17:33:57 -07:00
Chris Jones
6b36c3e919 Followup to bug 572939: include fixes for Mesa-family drivers that were accidentally omitted earlier. 2010-06-22 19:24:52 -05:00
Karl Tomlinson
51cbc2ced9 b=572968 use gdk_pixmap_foreign_new_for_screen to avoid XGetGeometry round trip r=jrmuizel 2010-06-23 11:11:42 +12:00
Oleg Romashin
3baacdf6ed Backout changeset 850ff2cf2868, ba88e35da4e7 due to crash on SVG test 2010-06-22 21:44:03 -04:00
Karl Tomlinson
28449a8986 b=573319 no longer use GdkPixmaps in offscreen-surfaces as they were unusable without a GdkColormap r?jrmuizel
--HG--
extra : rebase_source : 0e50d8eb410c6c130acbfa86d4e211083bab9a05
2010-06-22 20:00:38 -04:00
Oleg Romashin
6076bb7e64 Bug 567065 - Try to create offscreen Xlib surface from existing visual if possible. r=jmuizelaar.
--HG--
extra : rebase_source : 8dce785274ca66f36c46f960ca29bde0d3faff18
2010-06-22 19:59:42 -04:00
Oleg Romashin
df368b7846 Bug 572295 - Add "X11Util" to be shared between X11 toolkits. Qt bustage fix. r=jones.chris.g 2010-06-22 19:50:47 -04:00
Bas Schouten
c91eede928 Bug 573506: Expose GetDC/ReleaseDC on D2D surfaces. r=jrmuizel 2010-06-22 03:10:34 +02:00
Chris Jones
44f4fbe884 Bug 570294, part a: Style cleanup for gfxSharedImageSurface.h. r=joedrew 2010-06-21 15:35:49 -05:00
Chris Jones
bf91852da6 Bug 572295: Add X11Util.h for X11 toolkits. r=karlt,joedrew 2010-06-21 15:35:49 -05:00
Chris Jones
072b3cb9d2 Bug 570098: Implement operator== for a grab-bag of gfx types. r=joe 2010-06-21 15:35:49 -05:00
Matt Woodrow
9fb5f65fde Bug 572939: Implement GLContexProvider::CreateForWindow() for GLX. r=vlad 2010-06-18 18:17:00 -05:00
Doug Turner
ded51c1c5f Merging with M-C.
Hand merged the following files:

U chrome/src/nsChromeRegistry.cpp
U chrome/src/nsChromeRegistry.h
U content/base/src/nsFrameLoader.cpp
U content/base/src/nsFrameLoader.h
U dom/src/geolocation/nsGeolocation.cpp
U dom/src/geolocation/nsGeolocation.h
U netwerk/build/Makefile.in
U netwerk/cookie/nsCookieService.cpp
U netwerk/cookie/nsCookieService.h

--HG--
rename : extensions/cookie/test/unit/test_cookies.js => extensions/cookie/test/unit/test_cookies_thirdparty.js
rename : netwerk/cookie/src/nsCookieService.cpp => netwerk/cookie/nsCookieService.cpp
rename : netwerk/cookie/src/nsCookieService.h => netwerk/cookie/nsCookieService.h
rename : netwerk/dns/src/nsIDNKitInterface.h => netwerk/dns/nsIDNKitInterface.h
rename : netwerk/protocol/http/src/nsHttp.h => netwerk/protocol/http/nsHttp.h
rename : netwerk/protocol/http/src/nsHttpChannel.cpp => netwerk/protocol/http/nsHttpChannel.cpp
rename : netwerk/protocol/http/src/nsHttpChannel.h => netwerk/protocol/http/nsHttpChannel.h
rename : netwerk/protocol/http/src/nsHttpChunkedDecoder.h => netwerk/protocol/http/nsHttpChunkedDecoder.h
rename : netwerk/protocol/http/src/nsHttpHandler.cpp => netwerk/protocol/http/nsHttpHandler.cpp
rename : netwerk/protocol/http/src/nsHttpHeaderArray.h => netwerk/protocol/http/nsHttpHeaderArray.h
rename : netwerk/protocol/http/src/nsHttpRequestHead.h => netwerk/protocol/http/nsHttpRequestHead.h
rename : netwerk/protocol/http/src/nsHttpResponseHead.h => netwerk/protocol/http/nsHttpResponseHead.h
rename : netwerk/protocol/http/src/nsHttpTransaction.cpp => netwerk/protocol/http/nsHttpTransaction.cpp
rename : netwerk/protocol/res/src/nsResProtocolHandler.cpp => netwerk/protocol/res/nsResProtocolHandler.cpp
rename : netwerk/protocol/res/src/nsResProtocolHandler.h => netwerk/protocol/res/nsResProtocolHandler.h
2010-06-07 13:38:02 -07:00
Oleg Romashin
7a883a2803 Bug 548437 - Implement a SysV shared memory backend for Shmem and allow them to be used with Xshm. r=joe,sr=vladimir 2010-06-04 09:58:22 -04:00
Neil Rashbrook
9270d2e6b4 Bug 569490 Don't build D3D9 layer if we can't find d3d9.h r=ted,jmuizelaar 2010-06-06 11:37:44 +01:00
Timothy Nikkel
55fde443d9 Bug 563878. Part 2. Some view/ cleanup. r=mats
(transplanted from 5702bf7ea7eb85e1dbbd23a74f6e747e3b26edcd)

--HG--
extra : transplant_source : W%02%BF%7E%A7%EB%85%E1%DB%BD%23%A7Ont%7E%3B%26%ED%CD
2010-06-05 15:29:49 -05:00
Timothy Nikkel
3cf7abcc45 Bug 563878. Part 1b. Make nsIPresShell::RenderNode and nsIRenderingContext::SetClipRegion take an nsIntRegion. r=mats
(transplanted from d5ca465f42381d777adcc468c8fdf96942f1fcfe)

--HG--
extra : transplant_source : %D5%CAF_B8%1Dwz%DC%C4h%C8%FD%F9iB%F1%FC%FE
2010-06-05 15:29:49 -05:00
Timothy Nikkel
c98f610ec6 Bug 563878. Part 1a. Make nsThebesRegion hold a nsIntRegion like it should. r=mats
(transplanted from f2991bf41c20d8d20115d85506828cb0c727078d)

--HG--
extra : transplant_source : %F2%99%1B%F4%1C%20%D8%D2%01%15%D8U%06%82%8C%B0%C7%27%07%8D
2010-06-05 15:29:49 -05:00
Bas Schouten
ef1cf4a69e Bug 567844 Shared builds on Windows broken by bug 546515 - Add LayerManagerD3D9 to Dll dependencies only for XP_WIN. Patch by Bas, ifdefs by Walter Meini, r=roc 2010-05-25 09:43:30 +01:00
Bas Schouten
cd94c32d80 Bug 567966: Part 2: Remove rogue allocation from PlanarYCbCrImageD3D9. r=vlad 2010-05-25 09:37:21 +02:00
Bas Schouten
44402345e3 Bug 567966: Part 1: Properly handle siblings and children. Also fix missing release on container destructor. r=vlad 2010-05-25 09:37:19 +02:00
Vladimir Vukicevic
917dfcb032 b=567626; fix up opengl layers; r=bas 2010-05-24 23:35:35 -07:00
Bas Schouten
a6f5b5a240 Bug 567943: Let ContainerLayerD3D9 keep references to their children. r=roc 2010-05-25 04:43:59 +02:00
timeless@mozdev.org
b0d20bf42c Bug 565337 Please cache GetOpacity() in ContainerLayerOGL::RenderLayer. r=Bas
--HG--
extra : rebase_source : 101952fad466e60ac4933ac5d4c347c2b3449092
2010-05-23 15:34:58 -07:00
Jeff Muizelaar
e88bb567f0 Bug 548612. qcms: Reduce size of output lookup tables. r=bgirard
We currently use a larger output lookup table than we probably need. Switch to
a common define for the table size and lower it. The should also give a small
improvement to startup time because we have fewer lookup table entries to
compute.
2010-06-04 14:48:30 -04:00
Matthew Gregan
c5de9cd65f Bug 572034 - Use Linux x86_64 YCbCr routines on x86_64 OS X. Convert Linux routines to local asm labels. r=doublec 2010-06-21 12:18:13 -07:00
Bas Schouten
eef9f8187d Bug 565120: Deal with the case where a source lies outside of a destination surface. r=jrmuizel 2010-06-19 16:32:50 +02:00
Bas Schouten
8600c06954 Bug 565120: Do not upload partially when not required. r=jrmuizel 2010-06-19 16:32:48 +02:00
Matthew Gregan
46109db3bb Merge backout of bug 572034; hopefully fixes random orange bug 573161. 2010-06-19 11:44:13 +12:00
Matthew Gregan
547b93c9c2 Backed out changeset d268e54fbfcf (bug 572034) 2010-06-19 11:42:11 +12:00
Matthew Gregan
401e6bce67 Bug 572034 - Use Linux x86_64 Y'CbCr routines on x86_64 OS X. Convert Linux routines to local asm labels. r=chris.double
--HG--
extra : rebase_source : faa6af7f7529d05ec470796a369e7ea37daf3c69
2010-06-17 18:16:28 +12:00
Chris Pearce
e5dab52ad3 Backed out changeset f2835c78ef3f, Bug 572034. 2010-06-17 11:03:37 +12:00
Matthew Gregan
22a6073382 Bug 572034 - Enable asm optimized Y'CbCr conversion on OSX x86_64. r=doublec 2010-06-15 15:33:18 +12:00
Jonathan Kew
018a6f2a55 bug 571724 - check for missing hhea table; fall back to platform if unable to use harfbuzz with the given font. r=jdaggett 2010-06-16 07:37:37 +01:00
Bas Schouten
de9e7f2d59 Bug 557372: Don't create a SharedBitmap for A8_UNORM surfaces. This will fail. r=jrmuizel 2010-06-16 01:08:26 +02:00
Robert O'Callahan
a8f155672f Fixing bustage 2010-06-18 21:40:11 +12:00
Robert O'Callahan
56c8d0b82f Bug 572912. Fix surface type passed to cairo_quartz_surface_create during fallback for CGLayers. r=jrmuizel 2010-06-18 21:24:15 +12:00
Robert O'Callahan
e3bb21d777 Bug 572283. Part 3: Fix compiler warnings. r=vlad 2010-06-18 21:22:08 +12:00
Robert O'Callahan
0132a97ead Bug 572283. Fix CanvasLayerOGL to work with retained layers (and on Mac). r=vlad 2010-06-18 21:21:42 +12:00
Robert O'Callahan
68673e0e55 Bug 572288. Fix surface leak in CreateSimilarSurface. r=jrmuizel 2010-06-18 21:21:15 +12:00
Oleg Romashin
73bb827f5f Backed out changeset 598c5f8d295c, due Gdk-CRITICAL **: gdk_x11_visual_get_xvisual 2010-06-18 07:14:57 -04:00
Oleg Romashin
0e69160329 Bug 567065 - Try to create offscreen Xlib surface from existing visual if possible. r=jmuizelaar.
--HG--
extra : rebase_source : 6f5c766cab5a4f552c8e9911f80da560205d5ab2
2010-06-16 04:32:26 -04:00
Jesse Ruderman
f04ef428cb Remove stray line breaks from NS_ERROR messages, since they interfere with log processing. rs=jst
--HG--
extra : rebase_source : 87421691da969e0ebe5fbfbc44cd8f18617d1351
2010-06-17 13:28:38 -07:00
Jeff Muizelaar
7c9f77af68 Bug 563255. cairo: PDF-operators: ensure text operations flushed before emitting clip 2010-06-15 15:34:09 -04:00
Jeff Muizelaar
feeba174a7 Bug 563255. cairo: PS: Add missing 'q' when resetting clip path 2010-06-15 15:15:01 -04:00
Vladimir Vukicevic
3061c863cb untabifying GLContext.cpp 2010-06-14 23:56:29 -07:00
Matt Woodrow
add71beb77 b=565833; add GLX GLContextProvider, pbuffers only; r=vlad 2010-06-14 23:55:08 -07:00
Benoit Jacob
0ff97eaf80 b=569236; better WebGL messages; r=vladimir 2010-06-14 14:44:12 -04:00
Bas Schouten
2d1a915eac Bug 564959: Re-introduce division of text ranges for analysis at proper division points. r=jfkthame 2010-06-14 17:46:30 +02:00