Bug 75056 - Expose to Windows the way to allow a scheme access to Local Storage and Databases while Private Browsing is enabled
: Expose to Windows the way to allow a scheme access to Local Storage and Datab...
: WebKit
WebKit API
: 528+ (Nightly build)
: Unspecified Unspecified
: P2 Normal
Assigned To:
: InRadar
  Show dependency treegraph
Reported: 2011-12-21 17:10 PST by
Modified: 2011-12-21 17:43 PST (History)

Patch (2.38 KB, patch)
2011-12-21 17:15 PST, Jessie Berlin
no flags Review Patch | Details | Formatted Diff | Diff


You need to log in before you can comment on or make changes to this bug.

Description From 2011-12-21 17:10:29 PST

This is the Windows side of https://bugs.webkit.org/show_bug.cgi?id=71631.
------- Comment #1 From 2011-12-21 17:15:19 PST -------
Created an attachment (id=120245) [details]
------- Comment #2 From 2011-12-21 17:18:39 PST -------
Attachment 120245 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/update-webkit']" exit_code: 9

Updating OpenSource
First, rewinding head to replay your work on top of it...
Applying: Inform the scrolling coordinator when scrollbar layers come and go
Using index info to reconstruct a base tree...
<stdin>:474806: trailing whitespace.
        [Chromium] DatabaseTrackerChromium: iterating DatabaseSet races with Database disposal on worker thread 
<stdin>:474827: trailing whitespace.
        Nothing to test, just removing redundant code. Correct behavior tested by 
<stdin>:475346: trailing whitespace.

warning: 3 lines add whitespace errors.
Falling back to patching base and 3-way merge...
warning: too many files (created: 167528 deleted: 3), skipping inexact rename detection
Auto-merging LayoutTests/ChangeLog
CONFLICT (content): Merge conflict in LayoutTests/ChangeLog
Auto-merging LayoutTests/platform/chromium/test_expectations.txt
CONFLICT (content): Merge conflict in LayoutTests/platform/chromium/test_expectations.txt
Auto-merging Source/WebCore/ChangeLog
CONFLICT (content): Merge conflict in Source/WebCore/ChangeLog
Auto-merging Source/WebCore/page/ScrollingCoordinator.h
CONFLICT (content): Merge conflict in Source/WebCore/page/ScrollingCoordinator.h
Auto-merging Source/WebCore/page/mac/ScrollingCoordinatorMac.mm
CONFLICT (content): Merge conflict in Source/WebCore/page/mac/ScrollingCoordinatorMac.mm
Auto-merging Source/WebCore/platform/ScrollView.cpp
Auto-merging Source/WebCore/rendering/RenderLayerCompositor.cpp
CONFLICT (content): Merge conflict in Source/WebCore/rendering/RenderLayerCompositor.cpp
Auto-merging Source/WebKit2/ChangeLog
CONFLICT (content): Merge conflict in Source/WebKit2/ChangeLog
Auto-merging Tools/ChangeLog
CONFLICT (content): Merge conflict in Tools/ChangeLog
Auto-merging Tools/Scripts/build-webkit
Auto-merging Tools/Scripts/webkitdirs.pm
CONFLICT (content): Merge conflict in Tools/Scripts/webkitdirs.pm
Failed to merge in the changes.
Patch failed at 0001 Inform the scrolling coordinator when scrollbar layers come and go

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

rebase refs/remotes/origin/master: command returned error: 1

Died at Tools/Scripts/update-webkit line 158.

If any of these errors are false positives, please file a bug against check-webkit-style.
------- Comment #3 From 2011-12-21 17:22:36 PST -------
This spew has nothing to do with my patch.
------- Comment #4 From 2011-12-21 17:43:33 PST -------
(From update of attachment 120245 [details])
Committed in http://trac.webkit.org/changeset/103479