Changeset 171284 in webkit


Ignore:
Timestamp:
Jul 20, 2014 5:34:18 PM (10 years ago)
Author:
mitz@apple.com
Message:

Source/WebCore: <rdar://problems/17742611> -[_WKActivatedElementInfo image] is often empty
​https://bugs.webkit.org/show_bug.cgi?id=135107

Reviewed by Sam Weinig.

Test: TestWebKitAPI/Tests/mac/RenderedImageFromDOMNode.mm

  • page/FrameView.cpp:

(WebCore::FrameView::paintContents): To work around ​http://webkit.org/b/135106, replace the
paint root with its nearest ancestor that isn’t an inline with culled line boxes, if needed.

Tools: Test for <rdar://problems/17742611> -[_WKActivatedElementInfo image] is often empty
​https://bugs.webkit.org/show_bug.cgi?id=135107

Reviewed by Sam Weinig.

  • TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
  • TestWebKitAPI/Tests/mac/RenderedImageFromDOMNode.mm: Added.

(-[RenderedImageFromDOMNodeFrameLoadDelegate webView:didFinishLoadForFrame:]):
(TestWebKitAPI::TEST):

Location:
trunk
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r171283 r171284  
     12014-07-20  Dan Bernstein  <mitz@apple.com>
     2
     3        <rdar://problems/17742611> -[_WKActivatedElementInfo image] is often empty
     4        https://bugs.webkit.org/show_bug.cgi?id=135107
     5
     6        Reviewed by Sam Weinig.
     7
     8        Test: TestWebKitAPI/Tests/mac/RenderedImageFromDOMNode.mm
     9
     10        * page/FrameView.cpp:
     11        (WebCore::FrameView::paintContents): To work around http://webkit.org/b/135106, replace the
     12        paint root with its nearest ancestor that isn’t an inline with culled line boxes, if needed.
     13
    1142014-07-20  Darin Adler  <darin@apple.com>
    215

  • trunk/Source/WebCore/page/FrameView.cpp

    r171012 r171284  
    6565#include "RenderFullScreen.h"
    6666#include "RenderIFrame.h"
     67#include "RenderInline.h"
    6768#include "RenderLayer.h"
    6869#include "RenderLayerBacking.h"
    … …  
    36673668#endif
    36683669
     3670    // To work around http://webkit.org/b/135106, ensure that the paint root isn't an inline with culled line boxes.
     3671    // FIXME: This can cause additional content to be included in the snapshot, so remove this once that bug is fixed.
     3672    while (eltRenderer && eltRenderer->isRenderInline() && !toRenderInline(eltRenderer)->firstLineBox())
     3673        eltRenderer = eltRenderer->parent();
     3674
    36693675    rootLayer->paint(context, dirtyRect, m_paintBehavior, eltRenderer);
    36703676    if (rootLayer->containsDirtyOverlayScrollbars())

  • trunk/Tools/ChangeLog

    r171277 r171284  
     12014-07-20  Dan Bernstein  <mitz@apple.com>
     2
     3        Test for <rdar://problems/17742611> -[_WKActivatedElementInfo image] is often empty
     4        https://bugs.webkit.org/show_bug.cgi?id=135107
     5
     6        Reviewed by Sam Weinig.
     7
     8        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
     9        * TestWebKitAPI/Tests/mac/RenderedImageFromDOMNode.mm: Added.
     10        (-[RenderedImageFromDOMNodeFrameLoadDelegate webView:didFinishLoadForFrame:]):
     11        (TestWebKitAPI::TEST):
     12
    1132014-07-20  David Kilzer  <ddkilzer@apple.com>
    214

  • trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

    r170187 r171284  
    8282                3799AD3A14120A43005EB0C6 /* StringByEvaluatingJavaScriptFromString.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3799AD3914120A43005EB0C6 /* StringByEvaluatingJavaScriptFromString.mm */; };
    8383                37A6895F148A9B50005100FA /* SubresourceErrorCrash.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37A6895D148A9B50005100FA /* SubresourceErrorCrash.mm */; };
     84                37C784E0197C8F2E0010A496 /* RenderedImageFromDOMNode.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37C784DE197C8F2E0010A496 /* RenderedImageFromDOMNode.mm */; };
    8485                37DC678D140D7C5000ABCCDB /* DOMRangeOfString.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37DC678B140D7C5000ABCCDB /* DOMRangeOfString.mm */; };
    8586                37DC6791140D7D7600ABCCDB /* DOMRangeOfString.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 37DC678F140D7D3A00ABCCDB /* DOMRangeOfString.html */; };
    … …  
    420421                3799AD3914120A43005EB0C6 /* StringByEvaluatingJavaScriptFromString.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = StringByEvaluatingJavaScriptFromString.mm; sourceTree = "<group>"; };
    421422                37A6895D148A9B50005100FA /* SubresourceErrorCrash.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SubresourceErrorCrash.mm; sourceTree = "<group>"; };
     423                37C784DE197C8F2E0010A496 /* RenderedImageFromDOMNode.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RenderedImageFromDOMNode.mm; sourceTree = "<group>"; };
    422424                37DC678B140D7C5000ABCCDB /* DOMRangeOfString.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMRangeOfString.mm; sourceTree = "<group>"; };
    423425                37DC678F140D7D3A00ABCCDB /* DOMRangeOfString.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = DOMRangeOfString.html; sourceTree = "<group>"; };
    … …  
    10201022                                A57A34EF16AF677200C2501F /* PageVisibilityStateWithWindowChanges.mm */,
    10211023                                00BC16851680FE810065F1E5 /* PublicSuffix.mm */,
     1024                                37C784DE197C8F2E0010A496 /* RenderedImageFromDOMNode.mm */,
    10221025                                3722C8681461E03E00C45D00 /* RenderedImageFromDOMRange.mm */,
    10231026                                261516D515B0E60500A2C201 /* SetAndUpdateCacheModel.mm */,
    … …  
    12121215                                A7A966DB140ECCC8005EF9B4 /* CheckedArithmeticOperations.cpp in Sources */,
    12131216                                5142B2711517C88B00C32B19 /* ContextMenuCanCopyURL.mm in Sources */,
     1217                                37C784E0197C8F2E0010A496 /* RenderedImageFromDOMNode.mm in Sources */,
    12141218                                F6F3F29113342FEB00A6BF19 /* CookieManager.cpp in Sources */,
    12151219                                1ABC3DEF1899BE6D004F0626 /* Navigation.mm in Sources */,
Note: See TracChangeset for help on using the changeset viewer.