Changeset 69622 in webkit


Ignore:
Timestamp:
Oct 12, 2010 5:25:14 PM (14 years ago)
Author:
aestes@apple.com
Message:

2010-10-12 Eric Seidel <​eric@webkit.org>

Reviewed by Darin Adler.

REGRESSION (new parser): Leopard/Tiger Mail <head>/<body> quirk is gone
​https://bugs.webkit.org/show_bug.cgi?id=45693

  • WebKit.xcodeproj/project.pbxproj:
    • Add the MailQuirksUserScript.js to the project.

2010-10-12 Eric Seidel <​eric@webkit.org>

Reviewed by Darin Adler.

REGRESSION (new parser): Leopard/Tiger Mail <head>/<body> quirk is gone
​https://bugs.webkit.org/show_bug.cgi?id=45693

Re-implement this former WebCore parser quirk as a
Mac-only userscript-based quirk. As far as I can tell
from Darin's description this should satisfy Mail's needs.

  • Misc/MailQuirksUserScript.js: Added.
  • WebView/WebView.mm: (+[WebView _mailQuirksUserScript]): (-[WebView _injectMailQuirksScript]): (-[WebView _commonInitializationWithFrameName:groupName:usesDocumentViews:]):
Location:
trunk/WebKit
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit/ChangeLog

    r69549 r69622  
     12010-10-12  Eric Seidel  <eric@webkit.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        REGRESSION (new parser): Leopard/Tiger Mail <head>/<body> quirk is gone
     6        https://bugs.webkit.org/show_bug.cgi?id=45693
     7
     8        * WebKit.xcodeproj/project.pbxproj:
     9         - Add the MailQuirksUserScript.js to the project.
     10
    1112010-10-11  Anders Carlsson  <andersca@apple.com>
    212

  • trunk/WebKit/WebKit.xcodeproj/project.pbxproj

    r69549 r69622  
    337337                A7D3C5BC0B5773C5002CA450 /* WebPasteboardHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D3C5BA0B5773C5002CA450 /* WebPasteboardHelper.h */; };
    338338                A7D3C5BD0B5773C5002CA450 /* WebPasteboardHelper.mm in Sources */ = {isa = PBXBuildFile; fileRef = A7D3C5BB0B5773C5002CA450 /* WebPasteboardHelper.mm */; };
     339                A864B3F6123ED9FA00C2A612 /* MailQuirksUserScript.js in Resources */ = {isa = PBXBuildFile; fileRef = A864B3E5123ED83D00C2A612 /* MailQuirksUserScript.js */; };
    339340                AB9FBBBB0F8582B0006ADC43 /* WebDOMOperationsInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = AB9FBBBA0F8582B0006ADC43 /* WebDOMOperationsInternal.h */; };
    340341                ABDDF20D08EB0DDC001E1241 /* WebDownloadInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = ABDDF20C08EB0DDC001E1241 /* WebDownloadInternal.h */; };
    … …  
    647648                A7D3C5BA0B5773C5002CA450 /* WebPasteboardHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPasteboardHelper.h; sourceTree = "<group>"; };
    648649                A7D3C5BB0B5773C5002CA450 /* WebPasteboardHelper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPasteboardHelper.mm; sourceTree = "<group>"; };
     650                A864B3E5123ED83D00C2A612 /* MailQuirksUserScript.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = MailQuirksUserScript.js; sourceTree = "<group>"; };
    649651                AB9FBBBA0F8582B0006ADC43 /* WebDOMOperationsInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDOMOperationsInternal.h; sourceTree = "<group>"; };
    650652                ABDDF20C08EB0DDC001E1241 /* WebDownloadInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebDownloadInternal.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    … …  
    931933                        isa = PBXGroup;
    932934                        children = (
     935                                A864B3E5123ED83D00C2A612 /* MailQuirksUserScript.js */,
    933936                                1CCFFD120B1F81F2002EE926 /* OldWebAssertions.c */,
    934937                                5DE92FEE0BD7017E0059A5FD /* WebAssertions.h */,
    … …  
    16941697                        buildActionMask = 2147483647;
    16951698                        files = (
     1699                                A864B3F6123ED9FA00C2A612 /* MailQuirksUserScript.js in Resources */,
    16961700                                939810BA0824BF01008DF038 /* IDNScriptWhiteList.txt in Resources */,
    16971701                                5DE83A7F0D0F7FAD00CAD12A /* Localizable.strings in Resources */,

  • trunk/WebKit/mac/ChangeLog

    r69600 r69622  
     12010-10-12  Eric Seidel  <eric@webkit.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        REGRESSION (new parser): Leopard/Tiger Mail <head>/<body> quirk is gone
     6        https://bugs.webkit.org/show_bug.cgi?id=45693
     7
     8        Re-implement this former WebCore parser quirk as a
     9        Mac-only userscript-based quirk.  As far as I can tell
     10        from Darin's description this should satisfy Mail's needs.
     11
     12        * Misc/MailQuirksUserScript.js: Added.
     13        * WebView/WebView.mm:
     14        (+[WebView _mailQuirksUserScript]):
     15        (-[WebView _injectMailQuirksScript]):
     16        (-[WebView _commonInitializationWithFrameName:groupName:usesDocumentViews:]):
     17
    1182010-10-12  Simon Fraser  <simon.fraser@apple.com>
    219

  • trunk/WebKit/mac/WebView/WebView.mm

    r69373 r69622  
    638638}
    639639
     640static NSString *mailQuirksUserScriptPath()
     641{
     642    NSString *scriptPath = [[NSBundle bundleForClass:[WebView class]] pathForResource:@"MailQuirksUserScript" ofType:@"js"];
     643    return [[NSString alloc] initWithContentsOfFile:scriptPath];
     644}
     645
     646+ (NSString *)_mailQuirksUserScript
     647{
     648    static NSString* mailQuirksScript = mailQuirksUserScriptPath();
     649    return mailQuirksScript;
     650}
     651
     652- (void)_injectMailQuirksScript
     653{
     654    core(self)->group().addUserScriptToWorld(core([WebScriptWorld world]),
     655        [WebView _mailQuirksUserScript], KURL(), 0, 0, InjectAtDocumentEnd,
     656        InjectInAllFrames);
     657}
     658
    640659- (void)_commonInitializationWithFrameName:(NSString *)frameName groupName:(NSString *)groupName usesDocumentViews:(BOOL)usesDocumentViews
    641660{
    … …  
    755774#endif
    756775
     776    if (runningTigerMail() || runningLeopardMail())
     777        [self _injectMailQuirksScript];
    757778}
    758779
Note: See TracChangeset for help on using the changeset viewer.