author | aceman <acelists@atlas.sk> |
Wed, 04 Sep 2013 12:52:25 -0400 | |
changeset 145492 | 00209f73f7b636ae7ad780b86c6eaf831cb0092f |
parent 145491 | 617107cdc0f91a2fcde3af013e53b4df77a541bb |
child 145493 | 58a67d0f50bcde0e65e1c5d7f5d07422233a41d2 |
push id | 25214 |
push user | kwierso@gmail.com |
push date | Thu, 05 Sep 2013 00:02:20 +0000 |
treeherder | mozilla-central@99bd249e5a20 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | bz |
bugs | 677912, 136556 |
milestone | 26.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/content/html/document/src/ImageDocument.cpp +++ b/content/html/document/src/ImageDocument.cpp @@ -708,18 +708,18 @@ ImageDocument::UpdateTitleAndCharset() formatString, 1, getter_Copies(status)); } static const char* const formatNames[4] = { "ImageTitleWithNeitherDimensionsNorFile", "ImageTitleWithoutDimensions", - "ImageTitleWithDimensions", - "ImageTitleWithDimensionsAndFile", + "ImageTitleWithDimensions2", + "ImageTitleWithDimensions2AndFile", }; MediaDocument::UpdateTitleAndCharset(typeStr, formatNames, mImageWidth, mImageHeight, status); } void ImageDocument::ResetZoomLevel()
--- a/content/html/document/src/MediaDocument.h +++ b/content/html/document/src/MediaDocument.h @@ -47,17 +47,17 @@ protected: nsresult LinkStylesheet(const nsAString& aStylesheet); // |aFormatNames[]| needs to have four elements in the following order: // a format name with neither dimension nor file, a format name with // filename but w/o dimension, a format name with dimension but w/o filename, // a format name with both of them. For instance, it can have // "ImageTitleWithNeitherDimensionsNorFile", "ImageTitleWithoutDimensions", - // "ImageTitleWithDimesions", "ImageTitleWithDimensionsAndFile". + // "ImageTitleWithDimesions2", "ImageTitleWithDimensions2AndFile". // // Also see MediaDocument.properties if you want to define format names // for a new subclass. aWidth and aHeight are pixels for |ImageDocument|, // but could be in other units for other 'media', in which case you have to // define format names accordingly. void UpdateTitleAndCharset(const nsACString& aTypeStr, const char* const* aFormatNames = sFormatNames, int32_t aWidth = 0,
--- a/dom/locales/en-US/chrome/layout/MediaDocument.properties +++ b/dom/locales/en-US/chrome/layout/MediaDocument.properties @@ -1,21 +1,21 @@ # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -#LOCALIZATION NOTE (ImageTitleWithDimensionsAndFile): first %S is filename, second %S is type, third %S is width and fourth %S is height +#LOCALIZATION NOTE (ImageTitleWithDimensions2AndFile): first %S is filename, second %S is type, third %S is width and fourth %S is height #LOCALIZATION NOTE (ImageTitleWithoutDimensions): first %S is filename, second %S is type -#LOCALIZATION NOTE (ImageTitleWithDimensions): first %S is type, second %S is width and third %S is height +#LOCALIZATION NOTE (ImageTitleWithDimensions2): first %S is type, second %S is width and third %S is height #LOCALIZATION NOTE (ImageTitleWithNeitherDimensionsNorFile): first %S is type #LOCALIZATION NOTE (MediaTitleWithFile): first %S is filename, second %S is type #LOCALIZATION NOTE (MediaTitleWithNoInfo): first %S is type -ImageTitleWithDimensionsAndFile=%S (%S Image, %S\u00A0\u00D7\u00A0%S pixels) +ImageTitleWithDimensions2AndFile=%S (%S Image, %S\u00A0\u00D7\u00A0%S pixels) ImageTitleWithoutDimensions=%S (%S Image) -ImageTitleWithDimensions=(%S Image, %S\u00A0\u00D7\u00A0%S pixels) +ImageTitleWithDimensions2=(%S Image, %S\u00A0\u00D7\u00A0%S pixels) ImageTitleWithNeitherDimensionsNorFile=(%S Image) MediaTitleWithFile=%S (%S Object) MediaTitleWithNoInfo=(%S Object) InvalidImage=The image \u201c%S\u201d cannot be displayed because it contains errors. ScaledImage=Scaled (%S%%) TitleWithStatus=%S - %S