Commit Graph

61 Commits

Author SHA1 Message Date
Bobby Holley
05c4b5b375 Bug 578511 - Canvas API to disable sync decoding of images.r=roc,sr=vlad 2010-07-26 17:20:45 -04:00
Benoit Jacob
fa8498d3a8 b=576086; Remove sizeInBytes from WebGL; r=vladimir 2010-07-03 18:27:56 -04:00
Jason Duell
386a098a89 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
Doug Turner
b2c88178e3 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
Doug Turner
0dc0f3273e merge with m-c. resolved conflicts in:
U chrome/src/nsChromeRegistry.cpp
U content/base/src/Makefile.in
U dom/base/nsDOMClassInfo.cpp
U toolkit/toolkit-tiers.mk

--HG--
rename : toolkit/mozapps/extensions/test/unit/test_bug541420.js => toolkit/mozapps/extensions/test/xpcshell/test_bug541420.js
2010-05-11 11:09:54 -07:00
Benoit Jacob
daa03541ae b=571029; readPixels API change, support both old and new signatures, also fix 572797 (allow non-fitting rectangles), and check that sizes are nonnegative; r=vladimir 2010-06-19 10:46:12 -04:00
Benoit Jacob
54306dde5e b=567499; fix getuniform for bool uniforms and return nsIVariant; r=vladimir 2010-06-19 10:43:40 -04:00
Benoit Jacob
94ed436cac b=567499; let getXxxParameter functions return nsIVariant; r=vladimir 2010-06-19 10:42:43 -04:00
Benoit Jacob
a70d69dc53 b=571027; implement new PixelStorei parameters for textures; r=vladimir 2010-06-15 11:59:39 -04:00
Benoit Jacob
5a63875239 b=571027; implement new TexImage2D signatures; r=vladimir 2010-06-15 11:54:03 -04:00
Benoit Jacob
5d0602a31e b=571076; Implement GetAttachedShaders; r=vladimir 2010-06-15 11:49:34 -04:00
Benoit Jacob
9bbddc24a1 b=571028; remove GetString and merge into GetParameter as per the updated spec; r=vladimir 2010-06-11 17:45:40 -04:00
Benoit Jacob
7617ef1b94 b=569714; Fix GetParameter and let it return nsIVariant; r=vladimir 2010-06-11 17:36:34 -04:00
Josh Aas
39c5370501 nsICanvasRenderingContextWebGL.idl shouldn't define GL_TRUE or GL_FALSE. b=563372 r=vlad 2010-05-03 14:10:36 -04:00
Doug Turner
6b387f5757 Merge with mc 2010-03-08 10:09:55 -08:00
Doug Turner
c741a38e65 Merge 2010-03-01 15:36:51 -08:00
Vladimir Vukicevic
4b34c31138 b=534467; implement Uint8ClampedArray for CanvasPixelArray; part 3, DOM-side implementation; r=bz 2010-03-03 16:40:27 -08:00
Vladimir Vukicevic
c4950db7e3 Nuke some stale/unused files
* * *
attempt to fix x86-64 burning
2010-01-22 18:29:49 -08:00
Robert O'Callahan
090be2f360 Backing out bug 534467 to try to fix test failure 2010-03-04 17:50:57 +13:00
Robert O'Callahan
ed427979f2 Backed out changeset 1672d4c79e82 2010-03-04 17:50:28 +13:00
Robert O'Callahan
7593dadccb Back out due to Linux-64 build bustage 2010-03-04 14:38:23 +13:00
Robert O'Callahan
8da2509c8b Backed out changeset b35354fe21e3 2010-03-04 14:38:00 +13:00
Vladimir Vukicevic
90b432f3ea b=534467; implement Uint8ClampedArray for CanvasPixelArray; part 3, DOM-side implementation; r=bz 2010-03-03 16:40:27 -08:00
Vladimir Vukicevic
b112d82884 b=534735; use custom quickstubs for canvas fillStyle and strokeStyle; r=bz 2010-03-03 16:40:25 -08:00
Vladimir Vukicevic
83e7a08a06 Nuke some stale/unused files 2010-01-22 18:29:49 -08:00
Robert O'Callahan
ff44c3c9e3 Bug 534425. Part 6: Let nsIWidgets expose a LayerManager to be used to render into the widget, instead of nsPaintEvent::renderingContext which is removed since it's no longer needed. Currently all widgets fall back to a default BasicLayerManager implementation. Also change nsPaintEvent::region to be an nsIntRegion, and get rid of nsPaintEvent::rect since it's redundant. 2010-03-01 21:03:49 +13:00
Vladimir Vukicevic
39732698ea b=570538; [webgl] fix up buffer validation with interleaved data; r=bjacob 2010-06-08 15:14:43 -07:00
Benjamin Smedberg
c161f955a7 Merge mozilla-central with electrolysis. 2010-01-25 11:57:19 -05:00
Vladimir Vukicevic
410c9530e7 ugh, backout this until I figure out what's wrong with linux 2010-01-22 18:28:19 -08:00
Vladimir Vukicevic
edf96c8bc4 [webgl] (no bug, just removing unused/stale files) 2010-01-22 16:50:24 -08:00
Vladimir Vukicevic
b9734b7d34 b=539756; [webgl] remove old typed getters; r=jmuizelaar 2010-01-22 16:50:22 -08:00
Vladimir Vukicevic
465654dcaf b=533663; use js typed arrays in webgl; r=jmuizelaar,mrbkap,brendan 2010-01-22 13:34:25 -08:00
Benjamin Smedberg
4e352d7aeb Merge mozilla-central into electrolysis 2009-12-04 11:28:50 -05:00
Mark Steele
09c6fd8dc6 b=529717, change webgl object prefix to WebGL instead of Canvas; r=vlad 2009-12-02 13:38:39 -08:00
jacek@codeweavers.com
f123829915 Bug 516213 - Fix webgl compilation on mingw. r=vlad 2009-12-02 13:38:38 -08:00
Benjamin Smedberg
d74c6776f3 Merge mozilla-central into electrolysis. 2009-11-19 12:41:46 -05:00
Mark Steele
e79156ed76 b=526017, [webgl] collapse state query calls; r=vlad 2009-11-18 12:42:35 -08:00
Benjamin Smedberg
1d97bbb36a Merge from mozilla-central. 2009-11-06 09:54:28 -05:00
Joe Drew
84e878a14d Bug 505847 - Implement asyncDrawXULElement in 2D canvas. r=bz,bsmedberg 2009-10-29 13:58:31 -04:00
Joe Drew
7149d45ce5 Back out asyncDrawXULElement, since WebGL isn't ready to be compiled with -DUNICODE. 2009-10-28 18:51:59 -04:00
Joe Drew
2d91956179 Bug 505847 - Implement asyncDrawXULElement in 2D canvas. r=bz,bsmedberg 2009-10-28 16:55:49 -04:00
Vladimir Vukicevic
88afa1cc2e [webgl] Reland earlier-backed out patches, b=520708, b=520920, b=522201; r=me/mwsteele 2009-11-01 16:33:39 -08:00
Vladimir Vukicevic
51345f632c Revert previous commits due to weird talos crash. 2009-10-30 01:09:24 -07:00
Mark Steele
25a885d652 b=520920, update WebGL arrays to support views, r=vlad 2009-10-29 23:01:06 -07:00
Johnny Stenback
ac45fe56aa Part 2 of fix for bug 459452 (Add support for optional arg count for IDL methods): use [optional_argc] for DOM methods. r=peterv.
--HG--
extra : rebase_source : c0bc25842b2645fe9f42c9ed5d57567f8e6b5279
2009-08-10 16:41:12 +02:00
Vladimir Vukicevic
3255a6f7bb b=523229; WebGL rename clearDepthf/depthRangef to get rid of f suffix; r=mwsteele 2009-10-19 15:14:09 -07:00
Benjamin Smedberg
c827f3a584 Electrolysis-plugin-only bookkeeping commit. 2009-12-15 20:33:05 -05:00
Ms2ger@gmail.com
13925dabe1 Bug 534425 - Rev uuid. r=roc
--HG--
extra : rebase_source : 8f189550903221ce00d0a6ea5c51e3eeb1a6f8c0
2010-03-31 13:06:57 +02:00
Benoit Jacob
4268806ff0 b=565404; add WebGLUniformLocation object; r=vlad 2010-06-01 23:09:19 -07:00
Vladimir Vukicevic
79688aa1e8 b=551771; WebGL calls broken with boolean args in loop (qsgen octet handling); also rename all WebGL types to avoid conflicts with system GL types; r=jorendroff,joe 2010-05-28 15:52:39 -07:00