Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1029)

Unified Diff: Source/core/svg/SVGFitToViewBox.cpp

Issue 132233010: [SVG] SVGAnimatedRect migration to new SVG property impl. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebsaed Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/svg/SVGFitToViewBox.h ('k') | Source/core/svg/SVGGraphicsElement.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/svg/SVGFitToViewBox.cpp
diff --git a/Source/core/svg/SVGFitToViewBox.cpp b/Source/core/svg/SVGFitToViewBox.cpp
index 60425c87a885c2aa9da873cf6759d447d1580b81..f4eb9a1cf517df92fac3e466e50945076ce31668 100644
--- a/Source/core/svg/SVGFitToViewBox.cpp
+++ b/Source/core/svg/SVGFitToViewBox.cpp
@@ -32,71 +32,6 @@
namespace WebCore {
-template<typename CharType>
-static bool parseViewBoxInternal(Document* document, const CharType*& ptr, const CharType* end, FloatRect& viewBox, bool validate)
-{
- const CharType* start = ptr;
-
- skipOptionalSVGSpaces(ptr, end);
-
- float x = 0.0f;
- float y = 0.0f;
- float width = 0.0f;
- float height = 0.0f;
- bool valid = parseNumber(ptr, end, x) && parseNumber(ptr, end, y) && parseNumber(ptr, end, width) && parseNumber(ptr, end, height, false);
- if (!validate) {
- viewBox = FloatRect(x, y, width, height);
- return true;
- }
- if (!valid) {
- document->accessSVGExtensions()->reportWarning("Problem parsing viewBox=\"" + String(start, end - start) + "\"");
- return false;
- }
-
- if (width < 0.0) { // check that width is positive
- document->accessSVGExtensions()->reportError("A negative value for ViewBox width is not allowed");
- return false;
- }
- if (height < 0.0) { // check that height is positive
- document->accessSVGExtensions()->reportError("A negative value for ViewBox height is not allowed");
- return false;
- }
- skipOptionalSVGSpaces(ptr, end);
- if (ptr < end) { // nothing should come after the last, fourth number
- document->accessSVGExtensions()->reportWarning("Problem parsing viewBox=\"" + String(start, end - start) + "\"");
- return false;
- }
-
- viewBox = FloatRect(x, y, width, height);
- return true;
-}
-
-bool SVGFitToViewBox::parseViewBox(Document* document, const LChar*& ptr, const LChar* end, FloatRect& viewBox, bool validate)
-{
- return parseViewBoxInternal(document, ptr, end, viewBox, validate);
-}
-
-bool SVGFitToViewBox::parseViewBox(Document* document, const UChar*& ptr, const UChar* end, FloatRect& viewBox, bool validate)
-{
- return parseViewBoxInternal(document, ptr, end, viewBox, validate);
-}
-
-bool SVGFitToViewBox::parseViewBox(Document* document, const String& string, FloatRect& viewBox)
-{
- if (string.isEmpty()) {
- const LChar* ptr = 0;
- return parseViewBoxInternal<LChar>(document, ptr, ptr, viewBox, true);
- }
- if (string.is8Bit()) {
- const LChar* ptr = string.characters8();
- const LChar* end = ptr + string.length();
- return parseViewBox(document, ptr, end, viewBox, true);
- }
- const UChar* ptr = string.characters16();
- const UChar* end = ptr + string.length();
- return parseViewBox(document, ptr, end, viewBox, true);
-}
-
AffineTransform SVGFitToViewBox::viewBoxToViewTransform(const FloatRect& viewBoxRect, const SVGPreserveAspectRatio& preserveAspectRatio, float viewWidth, float viewHeight)
{
if (!viewBoxRect.width() || !viewBoxRect.height())
« no previous file with comments | « Source/core/svg/SVGFitToViewBox.h ('k') | Source/core/svg/SVGGraphicsElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698