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

Side by Side Diff: Source/core/inspector/InspectorFrontendHost.cpp

Issue 23581008: Revert r154797: "Move isValid/isCurrentColor from Color to StyleColor" (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) 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com> 3 * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 textEncoding = UTF8Encoding(); 275 textEncoding = UTF8Encoding();
276 useDetector = true; 276 useDetector = true;
277 } 277 }
278 RefPtr<TextResourceDecoder> decoder = TextResourceDecoder::create("text/plai n", textEncoding, useDetector); 278 RefPtr<TextResourceDecoder> decoder = TextResourceDecoder::create("text/plai n", textEncoding, useDetector);
279 return decoder->decode(data.data(), data.size()) + decoder->flush(); 279 return decoder->decode(data.data(), data.size()) + decoder->flush();
280 } 280 }
281 281
282 String InspectorFrontendHost::getSelectionBackgroundColor() 282 String InspectorFrontendHost::getSelectionBackgroundColor()
283 { 283 {
284 Color color = RenderTheme::theme().activeSelectionBackgroundColor(); 284 Color color = RenderTheme::theme().activeSelectionBackgroundColor();
285 return color != Color::transparent ? color.serialized() : ""; 285 return color.isValid() ? color.serialized() : "";
286 } 286 }
287 287
288 String InspectorFrontendHost::getSelectionForegroundColor() 288 String InspectorFrontendHost::getSelectionForegroundColor()
289 { 289 {
290 Color color = RenderTheme::theme().activeSelectionForegroundColor(); 290 Color color = RenderTheme::theme().activeSelectionForegroundColor();
291 return color != Color::transparent ? color.serialized() : ""; 291 return color.isValid() ? color.serialized() : "";
292 } 292 }
293 293
294 bool InspectorFrontendHost::supportsFileSystems() 294 bool InspectorFrontendHost::supportsFileSystems()
295 { 295 {
296 return true; 296 return true;
297 } 297 }
298 298
299 void InspectorFrontendHost::requestFileSystems() 299 void InspectorFrontendHost::requestFileSystems()
300 { 300 {
301 if (m_client) 301 if (m_client)
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 { 352 {
353 return false; 353 return false;
354 } 354 }
355 355
356 String InspectorFrontendHost::hiddenPanels() 356 String InspectorFrontendHost::hiddenPanels()
357 { 357 {
358 return ""; 358 return "";
359 } 359 }
360 360
361 } // namespace WebCore 361 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698