Brendan Dahl
1e077c8a5f
Bug 1104916 - Implement CSS media query display-mode. r=cam
2016-02-23 17:10:00 +01:00
Andrea Marchesini
7da3286f9d
Bug 1250148 - FormData should treat empty input type=file as empty string in FormData and as unnamed Blob in HTML submission, r=smaug
2016-02-23 18:38:16 +01:00
Andrew McCreight
b80e656e9e
Bug 1247679, part 3 - Replace NS_IMPL_CYCLE_COLLECTION_TRACE_JSVAL_MEMBER_CALLBACK with JS_MEMBER. r=smaug
2016-02-22 10:11:02 -08:00
Olli Pettay
c244a5179d
Bug 1249932 - indicate in the GC and CC log (browser console) whether it is about default or content process, r=mccr8
...
--HG--
extra : rebase_source : 94554d4651face04b90c6b9f1458d08f67be4a0b
2016-02-22 19:37:50 +02:00
Mantaroh Yoshinaga
fa2b32d1a6
Bug 1174624 - Add PortIdentifier copy code in order to communicate with same process. r=baku
2016-02-15 19:43:00 +01:00
Mantaroh Yoshinaga
0d77c71c32
Bug 1174624 - Add the Transferable parameter into SendAsyncMessage of nsFrameMessageManager. r=baku
2016-01-31 22:48:00 +01:00
Phil Ringnalda
1a1ec5b8bb
Merge f-t to m-c, a=merge
2016-02-20 17:25:14 -08:00
Olli Pettay
945a19d7cd
Bug 1249795 - Clear strong refs to message managers once we've destroyed nsFrameLoader, r=billm
2016-02-20 12:33:30 +02:00
Gijs Kruitbosch
8e0830e21c
Bug 1220160
- part 1: add chromeonly getter for documenturi that returns the original document when on an error page, r=bz
...
MozReview-Commit-ID: KaOc0WBxcIS
--HG--
extra : rebase_source : 4e37d4244e39b012e8c1eab989bf1c5d2ceef994
2016-02-15 23:46:49 +00:00
Olli Pettay
3af8f71a7e
Bug 1249428 - Unlink binding properly from element , r=mccr8
...
--HG--
extra : rebase_source : e549e1f2722173d2829c61a0c98c0d3c338379a5
2016-02-19 21:13:42 +02:00
Andrew McCreight
1575a306bd
Bug 1052793, part 2 - Shrink GC buffers during compartmental GCs. r=terrence
...
With part 1, many more GCs are compartmental, so it is no longer a
good indication that there is heavy activity. If we don't regularly
try to shrink GC buffers, we don't decommit arenas enough, causing a
large regression in memory usage.
2016-02-18 15:21:48 -08:00
Andrew McCreight
8705772a81
Bug 1052793, part 1 - Do per-zone GC for CC_WAITING triggers. r=smaug
2016-02-18 15:21:48 -08:00
Boris Zbarsky
13359b10de
Bug 1249102. Make overrides of WorkerRunnable::PostRun a bit more consistent. r=khuey
...
Specifically we make the following changes:
1) Remove WorkerSameThreadRunnable::PostRun, because it does exactly the same
things as WorkerRunnable::PostRun.
2) Always treat ModifyBusyCountFromWorker as infallible in terms of throwing
JS exceptions.
3) Change ExtendableFunctionalEventWorkerRunnable::PostRun to properly call
its superclass PostRun so we will correctly decrement the busy count our
PreDispatch incremented.
4) Document why some overrides of PreDispatch/PostDispatch are needed and
don't call into the superclass
2016-02-18 18:02:51 -05:00
Carsten "Tomcat" Book
6b54f0d05b
Backed out changeset e4b8bb93313b (bug 1229222)
2016-02-19 15:55:25 +01:00
Carsten "Tomcat" Book
f2a98554ec
Backed out changeset 27f3968ae8b2 (bug 1245184)
2016-02-19 15:55:23 +01:00
Andrea Marchesini
0a72c5e9e3
Bug 1245184 - CookieManager should remove cookies only if they match the userContextId, r=sicking
2016-02-19 14:49:50 +01:00
Dave Huseby
364ac22ba7
Bug 1229222 - add chromeutils for the creation of origin attributes with the correct default values. r=sicking
...
(HEAD -> oa, refs/patches/oa/Bug_1229222)
Fixes Bug 1229222
2016-02-18 13:42:00 +01:00
Jonathan Kew
badce210e1
Bug 1247335 - patch 3 - Check for potential DPI change after moving or resizing nsGlobalWindow. r=emk
2016-02-18 10:47:47 +00:00
Jonathan Kew
cb99502b79
Bug 1247335 - patch 1 - Provide a desktop-pixel variant of SetPosition on nsIBaseWindow and its implementations. r=emk
2016-02-18 10:46:16 +00:00
Boris Chiou
e436478f26
Bug 1244049 - Part 2: Replace nsCSSPseudoElements::Type with CSSPseudoElementType. r=dbaron
...
Also, try to use forward declaraions for CSSPseudoElementType;
--HG--
extra : rebase_source : c00eb9753e8f618a33aa711538ac45c0132b353c
2016-02-17 21:37:00 +01:00
Boris Chiou
185a769719
Bug 1244049 - Part 1: Define scoped enum for CSSPseudoElement type. r=dbaron
...
--HG--
extra : rebase_source : e53dd269e47fa97eb259ebd9295d012eacbdb612
2016-02-16 23:07:00 +01:00
Andrea Marchesini
01c41693ba
Bug 1245124 - window.open() should open a new tab in the same container, r=gijs, r=smaug
2016-02-18 08:33:07 +00:00
Morris Tseng
d3c7d2389b
Bug 1244118 - Shutdown threadpool when xpcom-shutdown-threads happened. r=roc
...
--HG--
extra : commitid : 6Ka2Zom2Ye5
2016-02-18 14:18:22 +08:00
Boris Zbarsky
3dba4c9b72
Bug 1248719. Fix things so that taking ownership of error reporting on an AutoJSAPI on a worker is OK even if that AutoJSAPI was initialized without an explicit global. r=bholley
2016-02-17 22:56:36 -05:00
Andrea Marchesini
0814fe6588
Bug 1246375 - Restore the previous spec version of FormData, r=smaug
2016-02-17 14:56:19 +00:00
Honza Bambas
bb09f0a670
Bug 1248049 - Don't HTTP cache XHR POSTs, r=jdm
2016-02-16 09:34:00 +01:00
J.C. Jones
70bc936cba
Bug 1231681 - "Implement window.u2f interface". r=baku, r=dkeeler
2016-02-09 16:43:00 +01:00
Xidorn Quan
7f068cc774
Bug 743198 part 11 - Update locales string to the new spelling as well as unprefixed API. r=smaug
...
The main motivation of this patch is to fix the prefixed function name
used in one string. But updated string should have different a different
identifier, otherwise it might be ignored. Since we should eventually
prefer using word "fullscreen" over "full-screen", it is easier to just
change all of them together.
--HG--
extra : source : 1e9ab6a7503102b5562475784510581720bd1bad
2016-02-17 08:47:11 +08:00
Xidorn Quan
775aed278a
Bug 743198 part 6 - Add unprefixed fullscreen events. r=smaug
...
--HG--
extra : source : cb096452899287cb35b51146d2f2ffc3dc26350f
2016-02-17 08:47:11 +08:00
Xidorn Quan
52ccd4a553
Bug 743198 part 4 - Rename LogFullScreenDenied to nsIDocument::DispatchFullscreenError, and reuse it in Element::RequestFullscreen. r=smaug
...
--HG--
extra : source : 3896197f9747aab588f6226efce4d67998619407
2016-02-17 08:47:11 +08:00
Xidorn Quan
0007f9248b
Bug 743198 part 3 - Refactor nsDocument::IsFullScreenEnabled to be static local function GetFullscreenError. r=smaug
...
--HG--
extra : source : e628336d1358c0fa5f614a27061809bc5aa08d00
2016-02-17 08:47:11 +08:00
Xidorn Quan
61f1684757
Bug 743198 part 2 - Add unprefixed Fullscreen API to Document and Element. r=smaug
...
--HG--
extra : source : aaf4d12b511ba25ba93e6135cb849a3264435f7c
2016-02-17 08:47:11 +08:00
Xidorn Quan
49647faf41
Bug 743198 part 1 - Drop [Throws] of document.mozFullScreenElement. r=smaug
...
This method actually never throws. IsFullScreenDoc() simply checks
whether GetFullScreenElement() returns nullptr, which means if that
method returns true, the "!el" check would never fail.
--HG--
extra : source : f32a1aeb6835fd4b4c47ef3abe6b9d7366ae4f07
2016-02-17 08:47:11 +08:00
Kyle Huey
31dabb4558
Bug 1247117: De-namespace much of IndexedDB. r=baku
2016-02-16 13:46:08 -08:00
Botond Ballo
45d03919dc
Bug 1238137 - Telemetry pings for main thread scrolling to bring the caret into view after moving it in response to keyboard input. r=ehsan
...
--HG--
extra : commitid : 6E0SPxaKbMl
extra : rebase_source : ca82cafc8b462318ffc5030319546731d9e7a540
extra : histedit_source : 63c1e103a3aaf2ce340b1b4f2276763c16ac2237
2016-02-03 20:36:24 -05:00
Carsten "Tomcat" Book
cef001abd6
merge mozilla-inbound to mozilla-central a=merge
2016-02-16 11:51:26 +01:00
Aidin Gharibnavaz
6863090c8a
Bug 1235830 - Renaming GetInternalNSEvent to WidgetEvent, in nsIDOMEvent r=smaug
...
MozReview-Commit-ID: Hm8Owq17KXn
--HG--
extra : transplant_source : 2%82%D5%89%19%94%7C%E7%CA1%99%B5%24%1F5%E1%C0%1F%DE%07
2016-02-12 19:10:07 +03:30
ISHIKAWA, Chiaki
be2b50a7f8
Bug 1248252 - Improper outdated octal constant syntax in M-C tree. Use '0o' prefix. r=dao
...
Be warned. Do not attemp to change the .js "test" source code in ./js
They are meant to check
- the outdated 0666 octal constant is still parsed correctly,
- the outdated 0666 octal constant raises syntax error flag
in strict mode, etc.
So leave them alone.
2016-02-15 08:57:00 +01:00
Jonathan Kew
03b35a5145
Bug 1247049 - Optimize GetScreenXY by using the new nsDeviceContext method to get desktop scale factor. r=emk
2016-02-15 09:07:53 +00:00
Ryo Motozawa
deefe8b274
Bug 1244586 part 3 - Remove unnecessary spaces in dom/base/Element.cpp. r=smaug
2016-02-15 09:34:47 +09:00
Ryo Motozawa
cc127029f8
Bug 1244586 part 1 - Add KeyframeEffect constructor in dom/webidl/KeyframeEffect.webidl. r=smaug,birtles
2016-02-15 09:34:47 +09:00
Christoph Kerschbaumer
27f2dec937
Bug 1247807 - Fix Mixed Content UI when using upgrade-insecure-requests (r=bz)
2016-02-12 14:51:07 -08:00
Mats Palmgren
28b48ce024
Bug 1216001 part 2 - Optimize nsRange::ExcludeNonSelectableNodes by counting ignorable whitespace text nodes next to an unselectable node as unselectable too. r=bz
2016-02-13 18:40:23 +01:00
Mats Palmgren
f3949ab1d3
Bug 1216001 part 1 - Optimize nsRange::IsNodeSelected. r=bz
2016-02-13 18:40:23 +01:00
Andrea Marchesini
f114621a79
Bug 1248022 - ConsoleEvent.styles can be a sequence of nullable strings, r=bz
2016-02-13 16:08:17 +00:00
Jonathan Kew
c0a5d86d94
Bug 1246346 - patch 2 - Correct the origin of the DOM screen coordinates (screen.left, screen.top) for secondary display on a mixed-DPI configuration. r=emk
2016-02-12 11:08:58 +00:00
Phil Ringnalda
9d0e08b626
Back out 3 changesets (bug 1216001) for Win8 reftest failures in 1193519-sideways-lr-3.html and 1193519-sideways-lr-4.html and intermittent OS X failures in font-display-2.html
...
CLOSED TREE
Backed out changeset dbadb8fe5803 (bug 1216001)
Backed out changeset a30593ebd58e (bug 1216001)
Backed out changeset c1646ffa71b4 (bug 1216001)
2016-02-11 20:43:41 -08:00
Mats Palmgren
41740a7ab3
Bug 1216001 part 2 - Optimize nsRange::ExcludeNonSelectableNodes by counting ignorable whitespace text nodes next to an unselectable node as unselectable too. r=bz
2016-02-12 02:13:57 +01:00
Mats Palmgren
a3c53b91a3
Bug 1216001 part 1 - Optimize nsRange::IsNodeSelected. r=bz
2016-02-12 02:13:57 +01:00
Deepthi Venkitaramanan
008e6b8991
Bug 1244328 - Merge the functionality of DOMSettableTokenList into DOMTokenList and make everything that used to refer to DOMSettableTokenList refer to DOMTokenList instead. r=bzbarsky
2016-02-11 17:50:42 -05:00
Matt Wobensmith
22c63dd7b5
Bug 1246227 - Remove SEC_NORMAL from dom/base/test (r=ckerschb)
2016-02-10 14:44:15 -08:00
Nathan Froyd
69d27155df
Bug 1247362 - move mAnonymousGlobalScope tracing into nsMessageManagerScriptExecutor; r=mccr8
2016-02-09 17:08:53 -05:00
Andrea Marchesini
a1204e41a8
Bug 1245957 - Adding assertions in Console about in which thread is running what, r=bz
2016-02-11 17:11:02 +00:00
Andrea Marchesini
e20d589c0b
Bug 1245954 - Console StartTimer/StopTimer and IncrementCounter should run in the owning thread, r=bz
2016-02-11 17:09:22 +00:00
Alexander Surkov
21059cdc0b
Bug 1247364 - add AllChildrenIterator::Seek, r=bz
2016-02-11 08:22:39 -05:00
Carsten "Tomcat" Book
f8f6be136b
Backed out changeset 84b8eef80b22 (bug 1234813
)
...
--HG--
extra : rebase_source : e11b61b728cfde2f6b807f1bcffbe932585ac8db
2016-02-11 11:32:32 +01:00
Christoph Kerschbaumer
1eafcb40c7
Bug 1234813
- sendBeacon should not throw if blocked by Content Policy. r=rbarnes
2015-12-23 11:50:05 -08:00
Aidin Gharibnavaz
686438c658
Bug 1164581 - Adding an overload for NS_ProxyRelease that accepts already_AddRefed, and removing all the others. r=bobbyholley
2016-02-10 08:23:00 +01:00
Nicholas Nethercote
8c78eddc4e
Bug 1246846
(part 1) - Avoid nsTHashtable::RawRemoveEntry() in dom/. r=bz.
...
This assumes that it's safe to possibly shrink the tables after the removal,
i.e. there are no surprising subtleties with how these tables are managed.
--HG--
extra : rebase_source : 2012becaa759d4330910534375b7ac2a9839fe50
2016-02-09 13:52:21 +11:00
Kartikaya Gupta
7c935ef5ba
Bug 1235899 - Don't allow frame reconstruction to clobber the APZ scroll offset. r=botond
...
MozReview-Commit-ID: HZMavMJNtmq
2016-02-10 16:31:20 -05:00
Valentin Gosu
35e6e18584
Bug 583170 - Handling IPv6 literal address differently to other browsers r=bz
2016-02-10 13:13:00 +01:00
Jorg K
af4cfedcf9
Bug 1230163 - White-space copy issue: Add conditional compile also for SeaMonkey. r=ehsan
2016-02-09 06:47:00 +01:00
Boris Zbarsky
7655d2a3f8
Bug 1245554. Window's named properties object should not claim to have duplicates of a given property name if it has multiple iframes with that name. r=peterv
...
The web platform test was pretty buggy in a few ways:
1) It claimed that "bar" should be non-writable and enumerable. This
explicitly contradicts the spec:
http://heycam.github.io/webidl/#named-properties-object-getownproperty step 3
substep 8 sets [[Writable]] to true, and
https://html.spec.whatwg.org/multipage/browsers.html#named-access-on-the-window-object
explicitly says these properties are unenumerable.
2) It claimed that "constructor" should be exposed on the named properties
object. But the named property visibility algorithm obviously returns false
for that property name, so it should not be exposed.
2016-02-09 17:40:45 -05:00
Boris Zbarsky
24566ec012
Bug 1243001 part 7. Stop wrappercaching dom::Promise when SPIDERMONKEY_PROMISE is defined. r=peterv
...
nsWrapperCache expects the object it stores to have an ObjectMoved op that will
notify the wrapper cache when the object is moved. SpiderMonkey promises don't
have a way to do this.
The XPCConvert changes are needed to allow code that passes around Promise
objects as nsISupports to continue working instead of ending up with
double-wrapped nsISupports (XPCWrappedNative for an nsISupports XPCWrappedJS)
around the SpiderMonkey Promise.
2016-02-09 17:40:31 -05:00
Boris Chiou
8627ee5709
Bug 1174575 - Part 5: Support pseudo-element type in StyleAnimation. r=birtles
...
Add one more argument, nsCSSPseudoElement::Type, for
StyleAnimation::ComputeValue and StyleAnimation::ComputeValues
2016-02-09 05:04:00 +01:00
Boris Chiou
84a4a3fe03
Bug 1174575 - Part 3: Implement KeyframeEffectReadOnly::GetTarget(). r=birtles
...
Implement GetTarget() and functions of CSSPseudoElement.
We use a strong reference from CSSPseudoElement to Element and a non-owning
reference from Element to CSSPseudoElement.
2016-02-01 23:59:00 +01:00
Boris Chiou
2f694d7e1e
Bug 1174575 - Part 2: Replace Element in KeyframeEffectReadOnly WebIDL. r=birtles, r=smaug
...
Use (Element or CSSPseudoElement)? as the first arguement of constructor and
the type of target.
2016-02-05 19:01:00 +01:00
Myk Melez
a6aff185d2
Bug 1238576 - disable mozApps API on desktop/Android; r=ehsan,ochameau,bz,mcmanus,jmaher,marco
2016-02-08 11:24:22 -08:00
Carsten "Tomcat" Book
5b358688b7
Backed out changeset c18e29c1b369 (bug 1164581) for cpp unit tests test failures
...
--HG--
extra : rebase_source : fb6fd434c8e3f4b5fa53ea645a54c07cab207894
2016-02-08 11:17:38 +01:00
Carsten "Tomcat" Book
6473ee6518
Merge mozilla-central to fx-team
2016-02-15 12:31:22 +01:00
Gijs Kruitbosch
6f78775522
Bug 1245264, r=bz
...
MozReview-Commit-ID: I0sVdritpD3
--HG--
extra : amend_source : 32de6ea861f1ab58390f94fd55eb5ea698a56723
2016-02-12 11:21:01 +00:00
Randall Barker
9a285c6d99
Bug 1250614 - Repeated zooming in bug on mobile Wikipedia site r=botond
2016-02-24 16:19:00 -08:00
Bobby Holley
eb6ef53678
Bug 1250767 - Add support for hanging servo node data off Gecko nodes. r=heycam,r=bz
2016-02-23 17:28:50 -08:00
Sebastian Hengst
48649adbe3
Backed out changeset 59ee7ae2519d (bug 1250767)
2016-02-24 22:50:51 +01:00
Bobby Holley
e1f6eb4ca5
Bug 1250767 - Add support for hanging servo node data off Gecko nodes. r=heycam,r=bz
2016-02-24 13:01:15 -08:00
Daniel Holbert
a192831f74
backout c42ff6847631 (bug 1250572) for causing aborts during startup
2016-02-24 11:54:35 -08:00
Andrea Marchesini
53c0f726fe
Bug 1250572 - Force a parent object in MessagePort/Channel and in StructuredCloneHolder, r=smaug
2016-02-24 20:04:37 +01:00
L. David Baron
19ebacc921
Bug 1247929 patch 1 - Add GetType() overrides for nsProgressFrame and nsMeterFrame. r=dholbert
...
These frames previously inherited nsFrame::GetType (which returns null).
MozReview-Commit-ID: 42UzPxaD5pN
2016-02-24 10:40:29 -08:00
Olli Pettay
bdb1f6d5c6
Bug 1197901, ensure sensor events dispatching follows the becoming spec change, r=bz
...
--HG--
extra : rebase_source : e44c3e357194067ddae10e8b19ee045fb39d36d6
2016-02-24 19:43:07 +02:00
Cameron McCormack
3633214b94
Bug 1250379 - Create css::Loaders for specific style backend types. r=dholbert
2016-02-24 18:01:12 +11:00
Cameron McCormack
0ecd5593cc
Bug 1244074
- Part 4: Use StyleSheetHandle instead of concrete style sheet class in most places. r=dholbert
2016-02-24 18:01:12 +11:00
Cameron McCormack
7c95c39734
Bug 1244068 - Part 4: Use StyleSetHandle instead of concrete style set class in most places. r=dholbert
2016-02-24 18:01:11 +11:00
Aidin Gharibnavaz
69cf7e035f
Bug 1164581 - Adding an overload for NS_ProxyRelease that accepts already_AddRefed, and removing all the others. r=bobbyholley
...
--HG--
extra : rebase_source : 3c6bba6613a14e48239d302bdd0f7fe2e322265d
2016-02-07 10:56:00 +01:00
Andrea Marchesini
2de5821ca7
Bug 1244995 - Console should trace the arguments correctly, r=bz
2016-02-07 10:29:12 +00:00
Jonathan Kew
08f9b29485
Bug 1240085
- Revert to CSS-pixel units for screenX, screenY, moveTo() APIs, and adjust the origin for secondary displays with differing resolution to avoid overlapping coordinate spaces. r=emk
2016-02-05 16:29:33 +00:00
Olli Pettay
56258865b9
Bug 1245452, null check window->GetDocShell return value, r=khuey
...
--HG--
extra : rebase_source : 411ce81c3471f398e60a26a9dd35d6f491af40ee
2016-02-05 21:22:31 +02:00
Jeffrey Tran
61a754e3d2
Bug 938699 - Remove FindElementWithViewId from nsIDOMWindowUtils.idl and nsDOMWindowUtils.cpp. r=kats
...
--HG--
extra : commitid : DV0Xw3rNDyo
2016-02-05 16:31:18 -05:00
Kyle Huey
730d44a1af
Bug 1245950: Followup to null check before asserting. r=me CLOSED TREE
2016-02-05 12:24:54 -08:00
Wes Kocher
ddcc30c564
Backed out changeset 4fa1296bd773 (bug 1104916) for win debug m(oth) permafails CLOSED TREE
...
--HG--
extra : commitid : HW3icAqLZUB
2016-02-05 11:42:55 -08:00
Kyle Huey
9d72cec3c2
Bug 1245950: Privately inherit from legacy interfaces nsIDOMWindow/nsIDOMWindowInternal. r=smaug
...
If you still need to get to these from C++ for some reason, you need to go through QueryInterface.
--HG--
extra : rebase_source : 3f0a71db0fb1dc48411aee19734446ea4f6e2e82
2016-02-05 10:12:25 -08:00
Carsten "Tomcat" Book
60c4cde799
Backed out changeset 76c66d5a8196 (bug 1000870)
2016-02-05 13:57:31 +01:00
Andrea Marchesini
b1ed8d2fbf
Bug 1245951 - "Unused method in WebSocket". r=smaug
2016-02-04 11:40:00 +01:00
Brendan Dahl
b25b48552b
Bug 1104916 - Implement CSS media query display-mode. r=cam
2016-02-04 13:34:00 +01:00
Maksim Lebedev
75f766038d
Bug 1000870 - Add some features in testing system. r=smaug
2015-05-19 07:03:00 +02:00
Bill McCloskey
d70c91802b
Bug 1210099 - Fix structured clone of expanded principal (r=bholley)
2016-02-04 22:30:21 -08:00
Phil Ringnalda
7e2cefc94c
Merge m-c to m-i
2016-02-04 19:26:14 -08:00
Brian Birtles
73e4706ab3
Bug 1239889 part 1 - Throw if the animation target does not have a current document; r=heycam
...
This is just a temporary measure to avoid a failed assertion / crash until we
fix bug 1245748.
2016-02-05 14:11:04 +11:00
William Chen
a7c2c21d89
Bug 1245242 - Normalize to unit vector for DOMMatrix.rotateAxisAngleSelf. r=roc
2016-02-04 00:30:00 -08:00
Mike de Boer
4af5fc2b24
Bug 1154277: Part 1 - allow to swap docShells on remote browsers that are not a child of a BrowserDOMWindow. r=smaug
2016-02-04 12:50:03 +01:00
Ting-Yu Lin
802d6dee0d
Bug 591737 - Add SummaryFrame. r=bz
...
--HG--
extra : commitid : 61ZPHBOWyKH
extra : rebase_source : 860919e85da1fc1593f084dcc1e011e1e6cddba3
2016-02-02 17:39:06 +08:00