Title: [162820] trunk/Source/WebCore
- Revision
- 162820
- Author
- [email protected]
- Date
- 2014-01-26 17:34:45 -0800 (Sun, 26 Jan 2014)
Log Message
Part 2: Assertion failure in WebCore::PseudoElement::didRecalcStyle()
<https://bugs.webkit.org/show_bug.cgi?id=126761>
<rdar://problem/15793540>
Reviewed by Simon Fraser.
* bindings/objc/DOM.mm:
(-[DOMElement image]):
(-[DOMElement _imageTIFFRepresentation]):
* platform/gtk/PasteboardGtk.cpp:
(WebCore::Pasteboard::writeImage):
* platform/win/PasteboardWin.cpp:
(WebCore::Pasteboard::writeImage):
(WebCore::getCachedImage):
* rendering/HitTestResult.cpp:
(WebCore::HitTestResult::image):
- More places where toRenderImage() should be used instead of
toImage().
- Fixed last two places where static_cast<WebCore::RenderImage*>
was being used instead of toRenderImage().
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (162819 => 162820)
--- trunk/Source/WebCore/ChangeLog 2014-01-27 01:28:01 UTC (rev 162819)
+++ trunk/Source/WebCore/ChangeLog 2014-01-27 01:34:45 UTC (rev 162820)
@@ -1,3 +1,26 @@
+2014-01-26 David Kilzer <[email protected]>
+
+ Part 2: Assertion failure in WebCore::PseudoElement::didRecalcStyle()
+ <https://bugs.webkit.org/show_bug.cgi?id=126761>
+ <rdar://problem/15793540>
+
+ Reviewed by Simon Fraser.
+
+ * bindings/objc/DOM.mm:
+ (-[DOMElement image]):
+ (-[DOMElement _imageTIFFRepresentation]):
+ * platform/gtk/PasteboardGtk.cpp:
+ (WebCore::Pasteboard::writeImage):
+ * platform/win/PasteboardWin.cpp:
+ (WebCore::Pasteboard::writeImage):
+ (WebCore::getCachedImage):
+ * rendering/HitTestResult.cpp:
+ (WebCore::HitTestResult::image):
+ - More places where toRenderImage() should be used instead of
+ toImage().
+ - Fixed last two places where static_cast<WebCore::RenderImage*>
+ was being used instead of toRenderImage().
+
2014-01-26 Chris Fleizach <[email protected]>
AX: Disable accessibility after every test run
Modified: trunk/Source/WebCore/bindings/objc/DOM.mm (162819 => 162820)
--- trunk/Source/WebCore/bindings/objc/DOM.mm 2014-01-27 01:28:01 UTC (rev 162819)
+++ trunk/Source/WebCore/bindings/objc/DOM.mm 2014-01-27 01:34:45 UTC (rev 162820)
@@ -644,7 +644,7 @@
{
// FIXME: Could we move this function to WebCore::Node and autogenerate?
WebCore::RenderObject* renderer = core(self)->renderer();
- if (!renderer || !renderer->isImage())
+ if (!renderer || !renderer->isRenderImage())
return nil;
WebCore::CachedImage* cachedImage = toRenderImage(renderer)->cachedImage();
if (!cachedImage || cachedImage->errorOccurred())
@@ -681,9 +681,9 @@
{
// FIXME: Could we move this function to WebCore::Element and autogenerate?
auto renderer = core(self)->renderer();
- if (!renderer || !renderer->isImage())
+ if (!renderer || !renderer->isRenderImage())
return nil;
- WebCore::CachedImage* cachedImage = static_cast<WebCore::RenderImage*>(renderer)->cachedImage();
+ WebCore::CachedImage* cachedImage = toRenderImage(renderer)->cachedImage();
if (!cachedImage || cachedImage->errorOccurred())
return nil;
return (NSData *)cachedImage->imageForRenderer(renderer)->getTIFFRepresentation();
Modified: trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp (162819 => 162820)
--- trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp 2014-01-27 01:28:01 UTC (rev 162819)
+++ trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp 2014-01-27 01:34:45 UTC (rev 162820)
@@ -207,7 +207,7 @@
void Pasteboard::writeImage(Element& element, const URL&, const String& title)
{
- if (!(element.renderer() && element.renderer()->isImage()))
+ if (!(element.renderer() && element.renderer()->isRenderImage()))
return;
RenderImage* renderer = toRenderImage(element.renderer());
Modified: trunk/Source/WebCore/platform/win/PasteboardWin.cpp (162819 => 162820)
--- trunk/Source/WebCore/platform/win/PasteboardWin.cpp 2014-01-27 01:28:01 UTC (rev 162819)
+++ trunk/Source/WebCore/platform/win/PasteboardWin.cpp 2014-01-27 01:34:45 UTC (rev 162820)
@@ -726,7 +726,7 @@
void Pasteboard::writeImage(Element& element, const URL&, const String&)
{
- if (!(element.renderer() && element.renderer()->isImage()))
+ if (!(element.renderer() && element.renderer()->isRenderImage()))
return;
RenderImage* renderer = toRenderImage(element.renderer());
@@ -862,7 +862,7 @@
{
// Attempt to pull CachedImage from element
RenderObject* renderer = element.renderer();
- if (!renderer || !renderer->isImage())
+ if (!renderer || !renderer->isRenderImage())
return 0;
RenderImage* image = toRenderImage(renderer);
Modified: trunk/Source/WebCore/rendering/HitTestResult.cpp (162819 => 162820)
--- trunk/Source/WebCore/rendering/HitTestResult.cpp 2014-01-27 01:28:01 UTC (rev 162819)
+++ trunk/Source/WebCore/rendering/HitTestResult.cpp 2014-01-27 01:34:45 UTC (rev 162820)
@@ -294,8 +294,8 @@
return 0;
auto renderer = m_innerNonSharedNode->renderer();
- if (renderer && renderer->isImage()) {
- RenderImage* image = static_cast<WebCore::RenderImage*>(renderer);
+ if (renderer && renderer->isRenderImage()) {
+ RenderImage* image = toRenderImage(renderer);
if (image->cachedImage() && !image->cachedImage()->errorOccurred())
return image->cachedImage()->imageForRenderer(image);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
