Commit Graph

234 Commits

Author SHA1 Message Date
Vladimir Vukicevic
54ce864ca8 b=571172; disable ANGLE compilation on Linux-x86_64, until build slaves are fixed 2010-07-14 20:52:37 -07:00
Vladimir Vukicevic
79bbb0f9ca b=571172; import and use ANGLE GLSL ES shader validator (disabled by default for now); r=joe 2010-07-14 20:52:34 -07:00
Zack Weinberg
29e6f9c217 Bug 571989 part 5: move gfx/src/thebes/utils/* to gfx/thebes. r=joedrew
--HG--
rename : gfx/src/thebes/utils/gfxBlur.cpp => gfx/thebes/gfxBlur.cpp
rename : gfx/src/thebes/utils/gfxBlur.h => gfx/thebes/gfxBlur.h
rename : gfx/src/thebes/utils/gfxThebesUtils.cpp => gfx/thebes/gfxThebesUtils.cpp
rename : gfx/src/thebes/utils/gfxThebesUtils.h => gfx/thebes/gfxThebesUtils.h
rename : gfx/src/thebes/utils/nsCoreAnimationSupport.h => gfx/thebes/nsCoreAnimationSupport.h
rename : gfx/src/thebes/utils/nsCoreAnimationSupport.mm => gfx/thebes/nsCoreAnimationSupport.mm
2010-07-13 14:54:21 -07:00
Benjamin Smedberg
4d172dd53d Merge mozilla-central, including the Electrolysis changes, into the branch for bug 568691. 2010-07-01 11:55:57 -04:00
Benjamin Smedberg
a2833452f8 Merge mozilla-central to the bug 568691 branch.
--HG--
rename : gfx/public/nsITheme.h => gfx/src/nsITheme.h
2010-06-30 14:23:23 -04:00
Benjamin Smedberg
63c0077443 Merge mozilla-central into the branch for bug 568691, including fixup of the new jetpack binary module. 2010-06-25 19:41:09 -04:00
Benjamin Smedberg
b205909598 Bug 568691 - register chrome/*.manifest in addition to components/*.manifest files, chrome appears to work in xpcshell again. 2010-06-21 13:49:38 -04:00
Benjamin Smedberg
45af085fff Merge mozilla-central into the "branch" for but 568691. The omnijar XPT/component/chrome registration was removed during this merge, and will be re-added to the component manager shortly.
--HG--
rename : content/base/public/nsIChromeRegistry.idl => chrome/public/nsIChromeRegistry.idl
2010-06-21 11:41:42 -04:00
Benjamin Smedberg
492155b10e Bug 568691 part C - Register all components based on reading .manifest files from the components directories. Binary components auto-register using "binary-component name.dll". JS components register using "component CID file.js" "contract @mozilla.org/contract;1 CID" and "category categoryname keyname value".
This patch has some bugs, specifically we stop looking for .manifest files in chrome/. I will fix that in a followup. It also probably breaks non-libxul builds because of ordering issues.

Another followup will actually fix our in-tree JS components and add build machinery for creating a proper components.manifest file.
2010-06-11 16:13:26 -04:00
Benjamin Smedberg
9045c05660 Bug 568691 part A - register static and binary components using data tables rather than programmatic nsIComponentRegistrar methods. This part contains the important needs-review bits of the change: part B contains the mechanical changes to each module in order to actually get a working build. Part C will contain changes necessary to register JS components from .manifest files 2010-06-10 14:11:11 -04:00
Zack Weinberg
cdb43c9602 Bug 571989 part 1: Move the contents of gfx/src/psshared into widget/src/gtk2, which is the sole user.
--HG--
rename : gfx/src/psshared/nsCUPSShim.cpp => widget/src/gtk2/nsCUPSShim.cpp
rename : gfx/src/psshared/nsCUPSShim.h => widget/src/gtk2/nsCUPSShim.h
rename : gfx/src/psshared/nsPSPrinters.cpp => widget/src/gtk2/nsPSPrinters.cpp
rename : gfx/src/psshared/nsPSPrinters.h => widget/src/gtk2/nsPSPrinters.h
rename : gfx/src/psshared/nsPaperPS.cpp => widget/src/gtk2/nsPaperPS.cpp
rename : gfx/src/psshared/nsPaperPS.h => widget/src/gtk2/nsPaperPS.h
2010-06-28 10:36:17 -07:00
Doug Turner
901e02b2de Merging with mozilla-central. Manually merged: content/canvas/src/nsCanvasRenderingContext2D.cpp ipc/ipdl/Makefile.in toolkit/toolkit-tiers.mk toolkit/xre/nsEmbedFunctions.cpp
--HG--
rename : gfx/thebes/src/gfxSharedImageSurface.cpp => gfx/thebes/gfxSharedImageSurface.cpp
rename : gfx/thebes/public/gfxSharedImageSurface.h => gfx/thebes/gfxSharedImageSurface.h
2010-06-28 16:33:19 -07:00
Michael Wu
01a2cef59b Bug 574120 - Add support for IPC on Android to everything else, r=dougt 2010-06-25 13:29:43 -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
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
Olli Pettay
58b4f71840 m-c to e10 merge 2010-05-24 17:45:59 +03:00
Chris Jones
9327ed8dcc Merged m-c 2010-05-13 18:04:53 -05:00
Doug Turner
fe405e740c 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
Doug Turner
8f97a20153 Merge with m-c. no hand edits 2010-04-29 21:04:50 -07:00
Ehsan Akhgari
cdd6eec761 Bug 534694 - Move the layout debug extension to layout/tools; r=ted,roc
--HG--
rename : extensions/layout-debug/Makefile.in => layout/tools/layout-debug/Makefile.in
rename : extensions/layout-debug/application.ini => layout/tools/layout-debug/application.ini
rename : extensions/layout-debug/chrome.manifest => layout/tools/layout-debug/chrome.manifest
rename : extensions/layout-debug/layoutdebug-prefs.js => layout/tools/layout-debug/layoutdebug-prefs.js
rename : extensions/layout-debug/makefiles.sh => layout/tools/layout-debug/makefiles.sh
rename : extensions/layout-debug/src/Makefile.in => layout/tools/layout-debug/src/Makefile.in
rename : extensions/layout-debug/src/nsDebugFactory.cpp => layout/tools/layout-debug/src/nsDebugFactory.cpp
rename : extensions/layout-debug/src/nsILayoutDebuggingTools.idl => layout/tools/layout-debug/src/nsILayoutDebuggingTools.idl
rename : extensions/layout-debug/src/nsILayoutRegressionTester.idl => layout/tools/layout-debug/src/nsILayoutRegressionTester.idl
rename : extensions/layout-debug/src/nsLayoutDebugCIID.h => layout/tools/layout-debug/src/nsLayoutDebugCIID.h
rename : extensions/layout-debug/src/nsLayoutDebugCLH.cpp => layout/tools/layout-debug/src/nsLayoutDebugCLH.cpp
rename : extensions/layout-debug/src/nsLayoutDebugCLH.h => layout/tools/layout-debug/src/nsLayoutDebugCLH.h
rename : extensions/layout-debug/src/nsLayoutDebuggingTools.cpp => layout/tools/layout-debug/src/nsLayoutDebuggingTools.cpp
rename : extensions/layout-debug/src/nsLayoutDebuggingTools.h => layout/tools/layout-debug/src/nsLayoutDebuggingTools.h
rename : extensions/layout-debug/src/nsRegressionTester.cpp => layout/tools/layout-debug/src/nsRegressionTester.cpp
rename : extensions/layout-debug/src/nsRegressionTester.h => layout/tools/layout-debug/src/nsRegressionTester.h
rename : extensions/layout-debug/ui/Makefile.in => layout/tools/layout-debug/ui/Makefile.in
rename : extensions/layout-debug/ui/content/layoutdebug-overlay.xul => layout/tools/layout-debug/ui/content/layoutdebug-overlay.xul
rename : extensions/layout-debug/ui/content/layoutdebug.js => layout/tools/layout-debug/ui/content/layoutdebug.js
rename : extensions/layout-debug/ui/content/layoutdebug.xul => layout/tools/layout-debug/ui/content/layoutdebug.xul
rename : extensions/layout-debug/ui/jar.mn => layout/tools/layout-debug/ui/jar.mn
rename : extensions/layout-debug/ui/locale/en-US/layoutdebug-overlay.dtd => layout/tools/layout-debug/ui/locale/en-US/layoutdebug-overlay.dtd
rename : extensions/layout-debug/ui/locale/en-US/layoutdebug.dtd => layout/tools/layout-debug/ui/locale/en-US/layoutdebug.dtd
2010-04-23 15:03:22 -04:00
Jacek Caban
a72879634c Bug 566467 - fixed compilation with --disable-ipc. [r=ted]
(transplanted from 4153cd536a731cf51eb7b40693213b79b0fbe5ec)

--HG--
extra : transplant_source : AS%CDSjs%1C%F5%1E%B7%B4%06%93%21%3By%B0%FB%E5%EC
2010-05-21 07:21:00 -04:00
Doug Turner
ed6494b616 merge with m-c. 2010-04-26 23:17:51 -07:00
Bas Schouten
181e985775 Bug 560147: Follow-up fixing non-libxul builds. This will include layers into thebes.dll, and ensure thebes.dll exposes the correct symbols. r=ted 2010-04-28 22:43:52 +02:00
Doug Turner
6c196f14e2 Automerge with mc. no manual changes 2010-04-21 03:31:13 -07:00
Mike Hommey
f950f70917 Bug 558789 - Allow to build against system libevent [r=benjamin, r=cjones]
--HG--
extra : rebase_source : cd964ba40277ebd89dda8392c8a842ca9ef01bf8
2010-04-20 09:06:55 +02:00
Chris Jones
09869cfb77 Merge mozilla-central 2010-04-16 01:34:35 -05:00
Doug Turner
c15f159231 merge from m-c. manually merging modules/plugin/test/testplugin/nptest.cpp dom/plugins/PluginModuleChild.cpp. 2010-03-26 14:22:48 -07:00
Dave Townsend
e225f4a276 Bug 553169: Implement InstallTrigger, the XPI content handler and confirmation for web triggered installs. r=robstrong, r=dveditz 2010-04-29 13:11:23 -07:00
Peter Van der Beken
3fcb7546e7 Fix for bug 560199 (Link XPConnect and caps into layout). r=jst.
--HG--
extra : rebase_source : 5141822e9d560019ffc1e0cb0264782aa8aa7a99
2010-04-11 15:55:24 +02:00
Michael Ventnor
3602bd64b6 Bug 544099 - Highly optimise -moz-box-shadow for common cases by allowing layout to specify an area where blurring is not needed r=roc,joe
--HG--
rename : gfx/thebes/src/gfxBlur.cpp => gfx/src/thebes/utils/gfxBlur.cpp
rename : gfx/thebes/public/gfxBlur.h => gfx/src/thebes/utils/gfxBlur.h
extra : rebase_source : d7ad7a1ee2ac9e25937133dba95f0f8d7347d612
2010-04-18 13:13:10 +10:00
Rob Arnold
fd95e7b700 Bug 563462 - Remove Photon bits from toolkit/ r=Mossop 2010-05-12 14:31:24 -04:00
Mike Hommey
7ef93c2266 Bug 448375 - Only depend on dbus-glib when needed. Depend on dbus instead [r=benjamin] 2010-04-24 09:39:53 +02:00
Chris Double
39352b97f4 Bug 551277 - Replace liboggplay YUV to RGB color conversion code - r=roc 2010-04-19 13:17:06 +12:00
Ted Mielczarek
9034abfe3b bug 553635 - link libimgicon into libxul in gtk builds. r=bsmedberg 2010-03-20 12:14:15 -04:00
Ben Newman
b3cb7ea79d Bug 516522 - CPOW: Cross-Process (JavaScript) Object Wrapper. r=mrbkap r=bent sr=jst 2009-11-06 12:43:39 -08:00
Doug Turner
d08632917d Merge with mc 2010-03-08 10:09:55 -08:00
Oleg Romashin
c4c4f0664c Bug 550468 - Fix support for Pango font engine on Qt platform. r=karlt. 2010-03-06 15:29:55 +02:00
Doug Turner
5daaf36bf1 Merge 2010-03-01 15:36:51 -08:00
Chris Jones
bc05dd163b Merge from mozilla-central 2010-02-22 21:31:18 -06:00
Chris Jones
2141078f6e Bug 441324, part 3: Configure and build changes for libmozalloc. r=bsmedberg 2010-03-03 23:02:57 -06:00
Oleg Romashin
10bae41c14 Bug 544250 - Implement different rendering backends for Qt mozilla port. r=jmuizelaar. 2010-02-19 19:46:54 -08:00
Robert O'Callahan
b69921495b Bug 534425. Part 4: Implement nsDisplayList::Paint using layers. r=mats,sr=dbaron 2010-03-01 20:56:19 +13:00
Mark Banner
be4c9ad69d Bug 552222 Drop MOZ_XPFE_COMPONENTS / --disable-xpfe-components. r=ted 2010-03-23 20:33:51 +00:00
Jonathan Kew
4b560e4029 bug 449292 - part 7 - implement gfxHarfBuzzShaper and provide pref to use this or platform back-end. r=jdaggett sr=roc 2009-10-07 18:16:52 +01:00
Chris Double
37b2e3b033 Bug 551277. Backed out changeset f9a11b9b2b9f 2010-04-06 18:10:02 +12:00
Chris Double
e762926f9d Bug 551277 - Implement software YCbCr conversion in layers, replacing liboggplay color conversion code - r=roc
--HG--
extra : rebase_source : 53b2c194aa6eb75a4751efdd83f066d3aeadf5d7
2010-04-06 12:07:39 +12:00
Benjamin Smedberg
3ad7eb7f3a Merge mozilla-central into electrolysis. 2010-02-09 21:22:09 -05:00
Doug Turner
c5fb72ab64 Bug 543976 - Clean up Maemo defines. r=ted 2010-02-09 11:02:11 -08:00
Boris Zbarsky
0468abc531 Bug 543079. Put system libs into OS_LIBS, not EXTRA_DSO_LDOPTS, when building libxul. r=ted 2010-02-09 12:09:06 -05:00
Benjamin Smedberg
570f731f49 Merge mozilla-central to electrolysis. 2010-01-07 22:11:14 -05:00