Chromium Code Reviews

Side by Side Diff: third_party/WebKit/Source/core/editing/Editor.cpp

Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-platform: rebase-yayyyyyyyy Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
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 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 424 matching lines...)
435 return toHTMLCanvasElement(node).copiedImage(FrontBuffer, PreferNoAccele ration); 435 return toHTMLCanvasElement(node).copiedImage(FrontBuffer, PreferNoAccele ration);
436 436
437 if (layoutObject->isImage()) { 437 if (layoutObject->isImage()) {
438 LayoutImage* layoutImage = toLayoutImage(layoutObject); 438 LayoutImage* layoutImage = toLayoutImage(layoutObject);
439 if (!layoutImage) 439 if (!layoutImage)
440 return nullptr; 440 return nullptr;
441 441
442 ImageResource* cachedImage = layoutImage->cachedImage(); 442 ImageResource* cachedImage = layoutImage->cachedImage();
443 if (!cachedImage || cachedImage->errorOccurred()) 443 if (!cachedImage || cachedImage->errorOccurred())
444 return nullptr; 444 return nullptr;
445 return cachedImage->image(); 445 return cachedImage->getImage();
446 } 446 }
447 447
448 return nullptr; 448 return nullptr;
449 } 449 }
450 450
451 static void writeImageNodeToPasteboard(Pasteboard* pasteboard, Node* node, const String& title) 451 static void writeImageNodeToPasteboard(Pasteboard* pasteboard, Node* node, const String& title)
452 { 452 {
453 ASSERT(pasteboard); 453 ASSERT(pasteboard);
454 ASSERT(node); 454 ASSERT(node);
455 455
(...skipping 911 matching lines...)
1367 } 1367 }
1368 1368
1369 DEFINE_TRACE(Editor) 1369 DEFINE_TRACE(Editor)
1370 { 1370 {
1371 visitor->trace(m_frame); 1371 visitor->trace(m_frame);
1372 visitor->trace(m_lastEditCommand); 1372 visitor->trace(m_lastEditCommand);
1373 visitor->trace(m_mark); 1373 visitor->trace(m_mark);
1374 } 1374 }
1375 1375
1376 } // namespace blink 1376 } // namespace blink
OLDNEW

Powered by Google App Engine