Changeset 107100 in webkit


Ignore:
Timestamp:
Feb 8, 2012 9:35:44 AM (12 years ago)
Author:
Antti Koivisto
Message:

REGRESSION (r106681): Null check missing in [WebFrame(WebInternal) _typingStyle]
https://bugs.webkit.org/show_bug.cgi?id=78080

Source/WebKit/mac:

Reviewed by Reviewed by Andreas Kling, Darin Adler and Dan Bernstein.

  • WebView/WebFrame.mm:

(-[WebFrame _typingStyle]):

Tools:

Reviewed by Andreas Kling, Darin Adler and Dan Bernstein.

Add API test.

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

(TestWebKitAPI):
(TestWebKitAPI::TEST):

Location:
trunk
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/mac/ChangeLog

    r107026 r107100  
     12012-02-07  Antti Koivisto  <antti@apple.com>
     2
     3        REGRESSION (r106681): Null check missing in [WebFrame(WebInternal) _typingStyle]
     4        https://bugs.webkit.org/show_bug.cgi?id=78080
     5
     6        Reviewed by Reviewed by Andreas Kling, Darin Adler and Dan Bernstein.
     7
     8        * WebView/WebFrame.mm:
     9        (-[WebFrame _typingStyle]):
     10
    1112012-02-07  Tony Chang  <tony@chromium.org>
    212
  • trunk/Source/WebKit/mac/WebView/WebFrame.mm

    r106681 r107100  
    792792    if (!_private->coreFrame)
    793793        return nil;
    794     RefPtr<CSSStyleDeclaration> typingStyle = _private->coreFrame->selection()->copyTypingStyle()->ensureCSSStyleDeclaration();
     794    RefPtr<StylePropertySet> typingStyle = _private->coreFrame->selection()->copyTypingStyle();
    795795    if (!typingStyle)
    796796        return nil;
    797     return kit(typingStyle.get());
     797    return kit(typingStyle->ensureCSSStyleDeclaration());
    798798}
    799799
  • trunk/Tools/ChangeLog

    r107098 r107100  
     12012-02-08  Antti Koivisto  <antti@apple.com>
     2
     3        REGRESSION (r106681): Null check missing in [WebFrame(WebInternal) _typingStyle]
     4        https://bugs.webkit.org/show_bug.cgi?id=78080
     5
     6        Reviewed by Andreas Kling, Darin Adler and Dan Bernstein.
     7       
     8        Add API test.
     9
     10        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
     11        * TestWebKitAPI/Tests/mac/TypingStyleCrash.mm: Added.
     12        (TestWebKitAPI):
     13        (TestWebKitAPI::TEST):
     14
    1152012-02-08  Gustavo Noronha Silva  <gns@gnome.org>
    216
  • trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

    r106751 r107100  
    118118                C0C5D3C61459912900A802A6 /* GetBackingScaleFactor_Bundle.mm in Sources */ = {isa = PBXBuildFile; fileRef = C0C5D3BD14598B6F00A802A6 /* GetBackingScaleFactor_Bundle.mm */; };
    119119                C507E8A714C6545B005D6B3B /* InspectorBar.mm in Sources */ = {isa = PBXBuildFile; fileRef = C507E8A614C6545B005D6B3B /* InspectorBar.mm */; };
     120                E490296814E2E3A4002BEDD1 /* TypingStyleCrash.mm in Sources */ = {isa = PBXBuildFile; fileRef = E490296714E2E3A4002BEDD1 /* TypingStyleCrash.mm */; };
    120121                F3FC3EE313678B7300126A65 /* libgtest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F3FC3EE213678B7300126A65 /* libgtest.a */; };
    121122                F6F3F29113342FEB00A6BF19 /* CookieManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6F3F29013342FEB00A6BF19 /* CookieManager.cpp */; };
     
    297298                C0C5D3BD14598B6F00A802A6 /* GetBackingScaleFactor_Bundle.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GetBackingScaleFactor_Bundle.mm; sourceTree = "<group>"; };
    298299                C507E8A614C6545B005D6B3B /* InspectorBar.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = InspectorBar.mm; sourceTree = "<group>"; };
     300                E490296714E2E3A4002BEDD1 /* TypingStyleCrash.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TypingStyleCrash.mm; sourceTree = "<group>"; };
    299301                F3FC3EE213678B7300126A65 /* libgtest.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgtest.a; sourceTree = BUILT_PRODUCTS_DIR; };
    300302                F6F3F29013342FEB00A6BF19 /* CookieManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CookieManager.cpp; sourceTree = "<group>"; };
     
    570572                                3799AD3914120A43005EB0C6 /* StringByEvaluatingJavaScriptFromString.mm */,
    571573                                37A6895D148A9B50005100FA /* SubresourceErrorCrash.mm */,
     574                                E490296714E2E3A4002BEDD1 /* TypingStyleCrash.mm */,
    572575                        );
    573576                        path = mac;
     
    769772                                93F7E86C14DC8E4D00C84A99 /* NewFirstVisuallyNonEmptyLayoutFrames.cpp in Sources */,
    770773                                BC22D31514DC689800FFB1DD /* UserMessage.cpp in Sources */,
     774                                E490296814E2E3A4002BEDD1 /* TypingStyleCrash.mm in Sources */,
    771775                        );
    772776                        runOnlyForDeploymentPostprocessing = 0;
Note: See TracChangeset for help on using the changeset viewer.