Commit Graph

2036 Commits

Author SHA1 Message Date
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
Jesse Ruderman
50758d9da0 Add crashtest for bug 540771 2010-06-28 14:58:58 -07:00
L. David Baron
c01ffe570a Make unconstrained width assertions into warnings because we can hit them when we clamp really large widths. (Bug 525100) r=roc 2010-06-28 13:47:39 -07:00
Oleg Romashin
b8ab8239cd Auto-merge with m-c b51803f3fdef 2010-06-25 08:30:40 -04:00
Doug Turner
4719dd0705 Automerge w mozilla-central 2010-06-24 14:06:13 -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
Johnny Stenback
b5ac9ee398 Backed out changeset 82a21d443b5e 2010-06-21 22:39:53 -07:00
Johnny Stenback
6268e31519 Fixing bug 572609. Use faster version of GetElementById() from our C++ code. r=jonas@sicking.cc 2010-06-21 19:58:50 -07:00
Honza Bambas
e075ab404a Bug 571380, e10s: build problem in content/canvas/src/nsCanvasRenderingContext2D.cpp(2653), r=roc 2010-06-12 13:37:59 +02: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
Mounir Lamouri
51117776b3 Bug 569337 - Fix compilation issues when SVG and SMIL are disabled. r=dbaron 2010-06-06 19:45:18 +02:00
Alexander Surkov
1b2bbba526 Bug 573706 - make frame based accessible creation more pellucid, r=davidb, sr=roc 2010-06-28 21:02:03 +09:00
Bas Schouten
998523d4ec Bug 574690: Don't have DocumentViewer call show on its window if the XULWindow will do this once it's done loading chrome. r=roc 2010-06-28 06:24:52 +02:00
Robert O'Callahan
87188f2833 Bug 572282. Reuse main window layer tree to paint child windows. r=mats 2010-06-28 12:30:39 +12:00
Timothy Nikkel
9df6bf07d2 Bug 496011. Add crashtest. 2010-06-27 16:00:16 -05:00
Timothy Nikkel
0b0bd05f6f Bug 534768. Add crashtest. 2010-06-27 16:00:13 -05:00
Timothy Nikkel
3ba589c76e Bug 572296. Fix logic error when adjusting the position to show the context menu at for a context menu key press. r=enndeakin 2010-06-27 15:58:56 -05:00
Mats Palmgren
ba0d9a576a Bug 536720 - Don't say the frame is in the nsGkAtoms::popupList if that list is empty. r=fantasai 2010-06-27 22:53:59 +02:00
Daniel Holbert
4418e720b6 whitespace-only fix to trigger another Win64 build 2010-06-26 19:43:13 -07:00
Daniel Holbert
ed05c57d55 Bug 574750: Use size_t for counter, in loops over contents of an nsCSSValue::Array. r=bz 2010-06-25 12:38:57 -07:00
Ehsan Akhgari
daaaa51f71 Bug 574071 - Intermittent failure in layout/base/crashtests/348729-1.html | assertion count 0 is less than expected 2 assertions; r=jesse 2010-06-25 15:12:00 -04:00
Timothy Nikkel
0d8eb620e3 Bug 563878. Part 1c. Misc layout cleanup. r=mats
(transplanted from 2c4a36b7e9ea2125b9daaab242202be4c34e46a5)

--HG--
extra : transplant_source : %2CJ6%B7%E9%EA%21%25%B9%DA%AA%B2B%20%2B%E4%C3NF%A5
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
14c5d0cae6 Bug 8253. Part 1. Disable first-letter and first-line styles in select elements. r=bzbarsky
(transplanted from b2d0bd7761a16e652727596f58b0edc1d57610d4)

--HG--
extra : transplant_source : %B2%D0%BDwa%A1ne%27%27YoX%B0%ED%C1%D5v%10%D4
2010-06-05 15:29:49 -05:00
Oleg Romashin
b36fb69349 Merge with latest mozilla central r 42802:ffbc3baf03ae 2010-05-25 15:19:33 -04:00
Olli Pettay
58b4f71840 m-c to e10 merge 2010-05-24 17:45:59 +03:00
Ehsan Akhgari
168fa38e97 Bug 569238 - Add some debugging information to determine what causes test_flush_on_paint.html to time out (temporary test-only change)
(transplanted from 9624407a729c81c531c7ab3a49e7209ede5525e0)

--HG--
extra : transplant_source : %96%24%40zr%9C%81%C51%C7%AB%3AI%E7%20%9E%DEU%25%E0
2010-06-04 13:28:19 -04:00
Ehsan Akhgari
17d8856c83 Bug 563864 - Add some debugging output to figure out what's going on with test_mozPaintCount.html intermittent oranges (temporary test-only change)
(transplanted from 9b29864cabd1b25cf5184d4f96ad75ff8ce99d4c)

--HG--
extra : transplant_source : %9B%29%86L%AB%D1%B2%5C%F5%18MO%96%ADu%FF%8C%E9%9DL
2010-06-04 13:28:19 -04:00
Doug Turner
3ad0032930 Merged with MC. Hand merged netwerk/protocol/http/src/nsHttpHandler.cpp
also removed modules/plugin/default*
2010-05-17 08:59:15 -07:00
Mounir Lamouri
a821ae13af Bug 456229 - Implement <input type="search">. r=smaug sr=sicking 2010-05-17 12:20:22 +02:00
Chris Jones
9327ed8dcc Merged m-c 2010-05-13 18:04:53 -05:00
Johnny Stenback
841261676e Fixing bug 572609. Use faster version of GetElementById() from our C++ code. r=jonas@sicking.cc 2010-06-23 14:35:57 -07:00
Benjamin Smedberg
a3250f5999 Bug 449129 followup: actually decrement the PaintTracker properly 2010-06-23 12:15:58 -04:00
Benjamin Smedberg
1af2f3576f Bug 449129 - abort a plugin process if a plugin attempts to spin an event loop while painting, r=jmathies 2010-06-23 10:18:00 -04:00
Boris Zbarsky
106aa16259 Bug 573127. Adjust the assert slightly to make it match reality. r=dbaron 2010-06-23 00:47:23 -04:00
Boris Zbarsky
7f14719c4d Bug 573241. When reparenting a style context, don't include any transition rules the old context might have had in the new one, since that can confuse transitions. r=dbaron 2010-06-23 00:46:27 -04: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
Timothy Nikkel
c59fbce1fb Bug 567292. When making asserts for lazy frame construction, if we hit a leaf frame, forgive any previous transgressions because leaf frames do their own thing. r=bzbarsky 2010-05-22 13:55:41 -05:00
Timothy Nikkel
86591e5c58 Bug 553359. Address review comments. 2010-05-22 13:55:41 -05:00
L. David Baron
fd6770787e content/html/content/src line in LOCAL_INCLUDES should not be conditional on MOZ_MEDIA. (Bug 567191) r=roc 2010-05-21 13:17:58 -07:00
Doug Turner
8f97a20153 Merge with m-c. no hand edits 2010-04-29 21:04:50 -07:00
Jim Mathies
f8e5ddc599 Bug 513162 - Document viewer to widget glue. r=bz. 2010-06-24 21:01:06 -05:00
L. David Baron
cfa59de4bb Don't bother with 16-bit reference count and index in nsCSSValue::Array. (Bug 574059) r=bzbarsky 2010-06-24 14:53:44 -07:00
Robert O'Callahan
6709a65d60 Backed out changeset efa8719a93d2 2010-05-21 16:34:23 +12:00
Robert O'Callahan
ddda37f6c8 Bug 564993. Part 5: Change ThebesLayer painting to be callback-based; move layer tree construction to FrameLayerBuilder. r=Bas,mats,sr=vlad 2010-05-21 15:20:48 +12:00
Robert O'Callahan
c57160c9f8 Bug 565569. Set primary frame for anonymous text in buttons. r=mats 2010-05-21 15:20:48 +12:00
Ehsan Akhgari
a87b134220 Bug 560647 - add startup timeline instrumentation; r=vlad 2010-05-19 19:22:19 -04:00
Robert O'Callahan
ed549b0dfb Bug 561959. Replace solid-color ThebesLayers with ColorLayers. r=dbaron 2010-05-13 12:56:11 +12:00
Jesse Ruderman
1b655ed5af Improve crashtests.list bug-annotations 2010-06-04 14:24:16 -07:00
Olli Pettay
078f01ee1d Bug 549682 - Port the message-manager API to mozilla-central, r=jst 2010-05-18 15:28:37 +03:00