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

Unified Diff: Source/core/inspector/InspectorStyleSheet.cpp

Issue 22887044: [oilpan] Make the oilpan branch build on Mac. (Closed) Base URL: svn://svn.chromium.org/blink/branches/oilpan
Patch Set: Add FIXME. Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/html/track/TextTrackCue.cpp ('k') | Source/core/loader/cache/CachedResourceClient.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InspectorStyleSheet.cpp
diff --git a/Source/core/inspector/InspectorStyleSheet.cpp b/Source/core/inspector/InspectorStyleSheet.cpp
index a77fce146be9ff6036bce3cfec5971eb9beb263f..7b1b6d75439f2f3590db8741271a98d703a9e708 100644
--- a/Source/core/inspector/InspectorStyleSheet.cpp
+++ b/Source/core/inspector/InspectorStyleSheet.cpp
@@ -64,7 +64,8 @@
#include <wtf/Vector.h>
using WebCore::CSSRuleSourceData;
-using WebCore::Handle;
+// FIXME(oilpan): On mac we cannot add 'using WebCore::Handle' here because
+// it conflicts with a core framework Handle type that is visible here.
using WebCore::Member;
using WebCore::Result;
using WebCore::RuleSourceDataVectorCollection;
@@ -109,7 +110,7 @@ void ParsedStyleSheet::setText(const String& text)
static void flattenSourceData(Vector<Member<CSSRuleSourceData> >& dataList, Vector<Member<CSSRuleSourceData> >& target)
{
for (size_t i = 0; i < dataList.size(); ++i) {
- Handle<CSSRuleSourceData> data = dataList.at(i);
+ WebCore::Handle<CSSRuleSourceData> data = dataList.at(i);
if (data->type == CSSRuleSourceData::STYLE_RULE)
target.append(data);
else if (data->type == CSSRuleSourceData::MEDIA_RULE)
« no previous file with comments | « Source/core/html/track/TextTrackCue.cpp ('k') | Source/core/loader/cache/CachedResourceClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698