2015-09-25  Brent Fulgham  <bfulgham@apple.com>

        Merge r190235. rdar://problem/22852382

    2015-09-24  Brent Fulgham  <bfulgham@apple.com>

            [Win] Support composited content in WebView render-to-context methods
            https://bugs.webkit.org/show_bug.cgi?id=149516
            <rdar://problem/22635080>

            Reviewed by Simon Fraser.

            * WebView.cpp:
            (WebView::paint): Call the new 'paintCompositedContentToHDC' method. If
            it handles the pain, return.
            (WebView::paintCompositedContentToHDC): New method to share code with other
            paint methods.
            (WebView::paintDocumentRectToContext): Call new 'paintCompositedContentToHDC'
            to handle any composited layers. Otherwise, use slow drawing path.
            (WebView::paintScrollViewRectToContextAtPoint): Ditto.
            (WebView::unused5): Work around a linker issue that may appear when building
            test infrastructure on this branch.
            * WebView.h:

2015-08-14  Babak Shafiei  <bshafiei@apple.com>

        Merge r188486.

    2015-08-13  Andy Estes  <aestes@apple.com>

            [Cocoa] Downloads do not start if policy decision is made asynchronously
            https://bugs.webkit.org/show_bug.cgi?id=147985

            Reviewed by Brady Eidson.

            * WebCoreSupport/WebFrameLoaderClient.cpp: Updated to include SubresourceLoader.h.

2015-08-06  Dana Burkart  <dburkart@apple.com>

        Merge r188005. rdar://problem/22059707

    2015-08-05  Brent Fulgham  <bfulgham@apple.com>

            [Win] Allow display of mixed content on Windows by default
            https://bugs.webkit.org/show_bug.cgi?id=147693
            <rdar://problem/22059707>

            Reviewed by Alex Christensen.

            * Interfaces/IWebPreferencesPrivate.idl: Add preference accessor
            to allow getting/setting use of insecure content.
            * WebPreferenceKeysPrivate.h: Add new key for preference.
            * WebPreferences.cpp: Implement preference accessor.
            * WebPreferences.h:
            * WebView.cpp: Set WebCore settings to match prefernces for
            loading mixed content.

2015-08-06  Dana Burkart  <dburkart@apple.com>

        Merge r187894. rdar://problem/15779101

    2015-08-04  Alex Christensen  <achristensen@webkit.org>

            Fix Windows build after r187886.

            * Plugins/PluginStream.h:
            Befriend PluginView.

2015-08-06  Dana Burkart  <dburkart@apple.com>

        Merge r187886. rdar://problem/15779101

    2015-08-04  Alexey Proskuryakov  <ap@apple.com>

            Implement NPAPI redirect handling
            https://bugs.webkit.org/show_bug.cgi?id=138675
            rdar://problem/15779101

            Patch by Jeffrey Pfau, updated and tweaked by me.

            Reviewed by Anders Carlsson.

            * Plugins/PluginStream.cpp:
            (WebCore::PluginStream::sendJavaScriptStream):
            (WebCore::PluginStream::willSendRequest):
            (WebCore::PluginStream::didReceiveResponse):
            * Plugins/PluginStream.h:

== Rolled over to ChangeLog-2015-07-23 ==