Use replacedContentBox for LayoutHTMLCanvas when deciding PaintLayer's contentBox.

Source/core/layout/compositing/CompositedDeprecatedPaintLayerMapping.cpp

 /*
  * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 21 matching lines @@
 #include "core/fetch/ImageResource.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/RemoteFrame.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLIFrameElement.h"
 #include "core/html/HTMLMediaElement.h"
 #include "core/html/HTMLVideoElement.h"
 #include "core/html/canvas/CanvasRenderingContext.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/layout/LayoutEmbeddedObject.h"
+#include "core/layout/LayoutHTMLCanvas.h"
 #include "core/layout/LayoutImage.h"
 #include "core/layout/LayoutPart.h"
 #include "core/layout/LayoutVideo.h"
 #include "core/layout/LayoutView.h"
 #include "core/layout/compositing/DeprecatedPaintLayerCompositor.h"
 #include "core/style/KeyframeList.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/Page.h"
 #include "core/page/scrolling/ScrollingCoordinator.h"
 #include "core/paint/DeprecatedPaintLayerPainter.h"
@@ skipping 15 matching lines @@
 namespace blink {
 
 using namespace HTMLNames;
 
 static IntRect clipBox(LayoutBox* layoutObject);
 
 static IntRect contentsRect(const LayoutObject* layoutObject)
 {
     if (!layoutObject->isBox())
         return IntRect();
+    if (layoutObject->isCanvas())
+        return pixelSnappedIntRect(toLayoutHTMLCanvas(layoutObject)->replacedContentRect());
+    if (layoutObject->isVideo())
+        return toLayoutVideo(layoutObject)->videoBox();
 
-    return layoutObject->isVideo() ?
-        toLayoutVideo(layoutObject)->videoBox() :
-        pixelSnappedIntRect(toLayoutBox(layoutObject)->contentBoxRect());
+    return pixelSnappedIntRect(toLayoutBox(layoutObject)->contentBoxRect());
 }
 
 static IntRect backgroundRect(const LayoutObject* layoutObject)
 {
     if (!layoutObject->isBox())
         return IntRect();
 
     LayoutRect rect;
     const LayoutBox* box = toLayoutBox(layoutObject);
     EFillBox clip = box->style()->backgroundClip();
@@ skipping 2251 matching lines @@
     } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) {
         name = "Scrolling Block Selection Layer";
     } else {
         ASSERT_NOT_REACHED();
     }
 
     return name;
 }
 
 } // namespace blink