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

Side by Side Diff: Source/core/dom/Document.cpp

Issue 24025002: The content='...' parsing error is not a viewport error, so keep it separate (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
(...skipping 3012 matching lines...) Expand 10 before | Expand all | Expand 10 after
3023 i++; 3023 i++;
3024 } 3024 }
3025 valueEnd = i; 3025 valueEnd = i;
3026 3026
3027 ASSERT_WITH_SECURITY_IMPLICATION(i <= length); 3027 ASSERT_WITH_SECURITY_IMPLICATION(i <= length);
3028 3028
3029 String keyString = buffer.substring(keyBegin, keyEnd - keyBegin); 3029 String keyString = buffer.substring(keyBegin, keyEnd - keyBegin);
3030 String valueString = buffer.substring(valueBegin, valueEnd - valueBegin) ; 3030 String valueString = buffer.substring(valueBegin, valueEnd - valueBegin) ;
3031 callback(keyString, valueString, this, data); 3031 callback(keyString, valueString, this, data);
3032 } 3032 }
3033 if (error) 3033 if (error) {
3034 reportViewportWarning(this, InvalidKeyValuePairSeparatorError, String(), String()); 3034 String message = "Error parsing a meta element's content: ';' is not a v alid key-value pair separator. Please use ',' instead.";
3035 addConsoleMessage(RenderingMessageSource, WarningMessageLevel, message);
Mike West 2013/09/06 12:33:27 Nit: If you don't mind, just inline this. There's
3036 }
3035 } 3037 }
3036 3038
3037 void Document::processViewport(const String& features, ViewportArguments::Type o rigin) 3039 void Document::processViewport(const String& features, ViewportArguments::Type o rigin)
3038 { 3040 {
3039 ASSERT(!features.isNull()); 3041 ASSERT(!features.isNull());
3040 3042
3041 // We are adding viewport properties from a legacy meta tag. 3043 // We are adding viewport properties from a legacy meta tag.
3042 // The different meta tags have different priorities based on the type regar dless 3044 // The different meta tags have different priorities based on the type regar dless
3043 // of which order they appear in the DOM. The priority is given by the 3045 // of which order they appear in the DOM. The priority is given by the
3044 // ViewportArguments::Type enum. If we process viewport properties with a lo wer 3046 // ViewportArguments::Type enum. If we process viewport properties with a lo wer
(...skipping 2390 matching lines...) Expand 10 before | Expand all | Expand 10 after
5435 { 5437 {
5436 return DocumentLifecycleNotifier::create(this); 5438 return DocumentLifecycleNotifier::create(this);
5437 } 5439 }
5438 5440
5439 DocumentLifecycleNotifier* Document::lifecycleNotifier() 5441 DocumentLifecycleNotifier* Document::lifecycleNotifier()
5440 { 5442 {
5441 return static_cast<DocumentLifecycleNotifier*>(ScriptExecutionContext::lifec ycleNotifier()); 5443 return static_cast<DocumentLifecycleNotifier*>(ScriptExecutionContext::lifec ycleNotifier());
5442 } 5444 }
5443 5445
5444 } // namespace WebCore 5446 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/viewport/viewport-warnings-5-expected.txt ('k') | Source/core/dom/ViewportArguments.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698