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

Side by Side Diff: Source/core/css/parser/BisonCSSParser-in.cpp

Issue 376213002: DevTools: Make FrameConsole methods accept ConsoleMessage objects. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@scriptFailedToParse
Patch Set: Created 6 years, 4 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
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/dom/Document.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. 8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
9 * Copyright (C) 2012 Intel Corporation. All rights reserved. 9 * Copyright (C) 2012 Intel Corporation. All rights reserved.
10 * 10 *
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 #include "core/css/StyleRule.h" 70 #include "core/css/StyleRule.h"
71 #include "core/css/StyleRuleImport.h" 71 #include "core/css/StyleRuleImport.h"
72 #include "core/css/StyleSheetContents.h" 72 #include "core/css/StyleSheetContents.h"
73 #include "core/css/parser/CSSParserIdioms.h" 73 #include "core/css/parser/CSSParserIdioms.h"
74 #include "core/dom/Document.h" 74 #include "core/dom/Document.h"
75 #include "core/frame/FrameConsole.h" 75 #include "core/frame/FrameConsole.h"
76 #include "core/frame/FrameHost.h" 76 #include "core/frame/FrameHost.h"
77 #include "core/frame/Settings.h" 77 #include "core/frame/Settings.h"
78 #include "core/frame/UseCounter.h" 78 #include "core/frame/UseCounter.h"
79 #include "core/html/parser/HTMLParserIdioms.h" 79 #include "core/html/parser/HTMLParserIdioms.h"
80 #include "core/inspector/ConsoleMessage.h"
80 #include "core/inspector/InspectorInstrumentation.h" 81 #include "core/inspector/InspectorInstrumentation.h"
81 #include "core/rendering/RenderTheme.h" 82 #include "core/rendering/RenderTheme.h"
82 #include "platform/FloatConversion.h" 83 #include "platform/FloatConversion.h"
83 #include "platform/RuntimeEnabledFeatures.h" 84 #include "platform/RuntimeEnabledFeatures.h"
84 #include "wtf/BitArray.h" 85 #include "wtf/BitArray.h"
85 #include "wtf/HexNumber.h" 86 #include "wtf/HexNumber.h"
86 #include "wtf/text/StringBuffer.h" 87 #include "wtf/text/StringBuffer.h"
87 #include "wtf/text/StringBuilder.h" 88 #include "wtf/text/StringBuilder.h"
88 #include "wtf/text/StringImpl.h" 89 #include "wtf/text/StringImpl.h"
89 #include "wtf/text/TextEncoding.h" 90 #include "wtf/text/TextEncoding.h"
(...skipping 1637 matching lines...) Expand 10 before | Expand all | Expand 10 after
1727 unsigned columnNumber = 0; 1728 unsigned columnNumber = 0;
1728 if (InspectorInstrumentation::hasFrontends()) { 1729 if (InspectorInstrumentation::hasFrontends()) {
1729 ensureLineEndings(); 1730 ensureLineEndings();
1730 TextPosition tokenPosition = TextPosition::fromOffsetAndLineEndings(loca tion.offset, *m_lineEndings); 1731 TextPosition tokenPosition = TextPosition::fromOffsetAndLineEndings(loca tion.offset, *m_lineEndings);
1731 lineNumberInStyleSheet = tokenPosition.m_line.zeroBasedInt(); 1732 lineNumberInStyleSheet = tokenPosition.m_line.zeroBasedInt();
1732 columnNumber = (lineNumberInStyleSheet ? 0 : m_startPosition.m_column.ze roBasedInt()) + tokenPosition.m_column.zeroBasedInt(); 1733 columnNumber = (lineNumberInStyleSheet ? 0 : m_startPosition.m_column.ze roBasedInt()) + tokenPosition.m_column.zeroBasedInt();
1733 } else { 1734 } else {
1734 lineNumberInStyleSheet = location.lineNumber; 1735 lineNumberInStyleSheet = location.lineNumber;
1735 } 1736 }
1736 FrameConsole& console = m_styleSheet->singleOwnerDocument()->frame()->consol e(); 1737 FrameConsole& console = m_styleSheet->singleOwnerDocument()->frame()->consol e();
1737 console.addMessage(CSSMessageSource, WarningMessageLevel, message, m_styleSh eet->baseURL().string(), lineNumberInStyleSheet + m_startPosition.m_line.zeroBas edInt() + 1, columnNumber + 1); 1738 console.addMessage(ConsoleMessage::create(CSSMessageSource, WarningMessageLe vel, message, m_styleSheet->baseURL().string(), lineNumberInStyleSheet + m_start Position.m_line.zeroBasedInt() + 1, columnNumber + 1));
1738 } 1739 }
1739 1740
1740 StyleRuleKeyframes* BisonCSSParser::createKeyframesRule(const String& name, Pass OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<StyleKeyframe> > > popKey frames, bool isPrefixed) 1741 StyleRuleKeyframes* BisonCSSParser::createKeyframesRule(const String& name, Pass OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<StyleKeyframe> > > popKey frames, bool isPrefixed)
1741 { 1742 {
1742 OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<StyleKeyframe> > > ke yframes = popKeyframes; 1743 OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<StyleKeyframe> > > ke yframes = popKeyframes;
1743 m_allowImportRules = m_allowNamespaceDeclarations = false; 1744 m_allowImportRules = m_allowNamespaceDeclarations = false;
1744 RefPtrWillBeRawPtr<StyleRuleKeyframes> rule = StyleRuleKeyframes::create(); 1745 RefPtrWillBeRawPtr<StyleRuleKeyframes> rule = StyleRuleKeyframes::create();
1745 for (size_t i = 0; i < keyframes->size(); ++i) 1746 for (size_t i = 0; i < keyframes->size(); ++i)
1746 rule->parserAppendKeyframe(keyframes->at(i)); 1747 rule->parserAppendKeyframe(keyframes->at(i));
1747 rule->setName(name); 1748 rule->setName(name);
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
2105 rule->setProperties(createStylePropertySet()); 2106 rule->setProperties(createStylePropertySet());
2106 clearProperties(); 2107 clearProperties();
2107 2108
2108 StyleRuleViewport* result = rule.get(); 2109 StyleRuleViewport* result = rule.get();
2109 m_parsedRules.append(rule.release()); 2110 m_parsedRules.append(rule.release());
2110 2111
2111 return result; 2112 return result;
2112 } 2113 }
2113 2114
2114 } 2115 }
OLDNEW
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/dom/Document.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698