Changeset 121836 in webkit


Ignore:
Timestamp:
Jul 4, 2012 12:53:20 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r121813.
​http://trac.webkit.org/changeset/121813
​https://bugs.webkit.org/show_bug.cgi?id=90522

Causes browser_tests failure:
ErrorPageTest.DNSError_GoBack2{Forward2,AndForward} on
Chromium {Linux,Mac,Win} (Requested by yosin on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2012-07-04

Source/WebCore:

  • loader/DocumentLoader.cpp:

(WebCore::DocumentLoader::commitData):
(WebCore::DocumentLoader::setupForReplaceByMIMEType):

  • testing/js/WebCoreTestSupport.cpp:

(WebCoreTestSupport::resetInternalsObject):

LayoutTests:

  • http/tests/multipart/multipart-replace-non-html-content-expected.txt: Removed.
  • http/tests/multipart/multipart-replace-non-html-content.php: Removed.
Location:
trunk
Files:
2 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r121833 r121836  
     12012-07-04  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r121813.
     4        http://trac.webkit.org/changeset/121813
     5        https://bugs.webkit.org/show_bug.cgi?id=90522
     6
     7        Causes browser_tests failure:
     8        ErrorPageTest.DNSError_GoBack2{Forward2,AndForward} on
     9        Chromium {Linux,Mac,Win} (Requested by yosin on #webkit).
     10
     11        * http/tests/multipart/multipart-replace-non-html-content-expected.txt: Removed.
     12        * http/tests/multipart/multipart-replace-non-html-content.php: Removed.
     13
    1142012-07-04  Kihong Kwon  <kihong.kwon@samsung.com>
    215

  • trunk/Source/WebCore/ChangeLog

    r121833 r121836  
     12012-07-04  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r121813.
     4        http://trac.webkit.org/changeset/121813
     5        https://bugs.webkit.org/show_bug.cgi?id=90522
     6
     7        Causes browser_tests failure:
     8        ErrorPageTest.DNSError_GoBack2{Forward2,AndForward} on
     9        Chromium {Linux,Mac,Win} (Requested by yosin on #webkit).
     10
     11        * loader/DocumentLoader.cpp:
     12        (WebCore::DocumentLoader::commitData):
     13        (WebCore::DocumentLoader::setupForReplaceByMIMEType):
     14        * testing/js/WebCoreTestSupport.cpp:
     15        (WebCoreTestSupport::resetInternalsObject):
     16
    1172012-07-04  Kihong Kwon  <kihong.kwon@samsung.com>
    218

  • trunk/Source/WebCore/loader/DocumentLoader.cpp

    r121813 r121836  
    336336#endif
    337337
    338         if (!frameLoader()->isReplacing())
    339             frameLoader()->receivedFirstData();
     338        frameLoader()->receivedFirstData();
    340339
    341340        bool userChosen = true;
    … …  
    368367void DocumentLoader::setupForReplaceByMIMEType(const String& newMIMEType)
    369368{
    370     if (!mainResourceData())
     369    if (!m_gotFirstByte)
    371370        return;
    372371   

  • trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp

    r121813 r121836  
    5353    JSLockHolder lock(exec);
    5454    JSDOMGlobalObject* globalObject = jsCast<JSDOMGlobalObject*>(exec->lexicalGlobalObject());
    55     JSValue internalsJS = globalObject->getDirect(exec->globalData(), Identifier(exec, Internals::internalsId));
    56     if (internalsJS.isNull() || internalsJS.isEmpty())
    57         return;
    58     if (Internals* internals = toInternals(internalsJS)) {
     55    Internals * internals = toInternals(globalObject->getDirect(exec->globalData(), Identifier(exec, Internals::internalsId)));
     56    if (internals) {
    5957        ScriptExecutionContext* scriptContext = globalObject->scriptExecutionContext();
    6058        if (scriptContext->isDocument())
Note: See TracChangeset for help on using the changeset viewer.