Bug 28277

Summary: Merge error in SharedWorker code
Product: WebKit Reporter: Andrew Wilson <atwilson>
Component: WebCore JavaScriptAssignee: Andrew Wilson <atwilson>
Status: RESOLVED FIXED    
Severity: Normal CC: eric
Priority: P2    
Version: 528+ (Nightly build)   
Hardware: PC   
OS: OS X 10.5   
Attachments:
Description Flags
proposed patch
none
patch without tabs none

Description Andrew Wilson 2009-08-13 13:36:15 PDT
There is a merge error in the checked-in shared worker code that is preventing WebKit from compiling with ENABLE_SHARED_WORKERS set.
Comment 1 Andrew Wilson 2009-08-13 13:39:37 PDT
Created attachment 34780 [details]
proposed patch
Comment 2 Andrew Wilson 2009-08-13 13:41:50 PDT
Created attachment 34781 [details]
patch without tabs
Comment 3 Eric Seidel (no email) 2009-08-13 15:00:10 PDT
Comment on attachment 34781 [details]
patch without tabs

Rejecting patch 34781 from commit-queue.  This patch will require manual commit.

Failed to run "['git', 'svn', 'dcommit']"  exit_code: 1  cwd: None
Comment 4 Eric Seidel (no email) 2009-08-13 15:27:19 PDT
Comment on attachment 34781 [details]
patch without tabs

bugzilla-tool isn't smart enough yet to notice when someone commits while tests are running and update.  Adding this back the commit queue.
Comment 5 Eric Seidel (no email) 2009-08-13 15:55:57 PDT
Comment on attachment 34781 [details]
patch without tabs

Clearing flags on attachment: 34781

Committing to http://svn.webkit.org/repository/webkit/trunk ...
	M	WebCore/ChangeLog
	M	WebCore/workers/DefaultSharedWorkerRepository.cpp
Committed r47248
	M	WebCore/ChangeLog
	M	WebCore/workers/DefaultSharedWorkerRepository.cpp
r47248 = a0d79bf391b0d757d04794bb3b9f5a415cbc8af0 (trunk)
No changes between current HEAD and refs/remotes/trunk
Resetting to the latest refs/remotes/trunk
http://trac.webkit.org/changeset/47248
Comment 6 Eric Seidel (no email) 2009-08-13 15:56:00 PDT
All reviewed patches have been landed.  Closing bug.