Bug 78581

Created attachment 126918 [details] Patch

FYI, I follow (Web)ApplicationCacheHost(Internal) structure.

Comment on attachment 126918 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=126918&action=review > Source/WebKit/chromium/ChangeLog:3 > + Provide SocketStreamHandleInternal::toWebSocketStreamHandle(SocketStreamHandle*). You need to explain why you want to change so in ChangeLog. > Source/WebKit/chromium/src/SocketStreamHandleInternal.h:1 > +/* We need to add new header file to build files such as gyp, project.pbxproj, etc.

Comment on attachment 126918 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=126918&action=review >> Source/WebKit/chromium/ChangeLog:3 >> + Provide SocketStreamHandleInternal::toWebSocketStreamHandle(SocketStreamHandle*). > > You need to explain why you want to change so in ChangeLog. OK, done. >> Source/WebKit/chromium/src/SocketStreamHandleInternal.h:1 >> +/* > > We need to add new header file to build files such as gyp, project.pbxproj, etc. Oh, I see. 'git grep SocketStreamHandle.cpp' said only Source/WebKit/chromium/WebKit.gyp had SocketStreamHandle.cpp entry. So the entry for this forked SocketStreamHandleInternal.h must exist only in WebKit.gyp, right?

Created attachment 126958 [details] Patch

Attachment 126958 [details] did not pass style-queue: Failed to run "['Tools/Scripts/update-webkit']" exit_code: 9 Updating OpenSource From git://git.webkit.org/WebKit 89fa825..7073cfc master -> origin/master Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 107703 = 89fa825f2e0fe492dd061df01ad7ee29c4b74bb5 r107704 = 33b15d614f2dbd315b4dd92cf0040b70170bcd08 r107705 = 8ec002b7e56d614bb4eadfeac8d62e82d39596e3 r107706 = 36762184c16580178be0e530b70101c9cebd9154 r107707 = 1571338c7917a556dcd0a62d56a665c094e4cc2e r107708 = 7073cfc483f9201a0237ac9090c1ca6bb424de97 Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Applying: [Mac][Win][WK2] Switch to RFC 6455 protocol for WebSockets Using index info to reconstruct a base tree... <stdin>:1578: trailing whitespace. <stdin>:1647: trailing whitespace. <stdin>:1657: trailing whitespace. <stdin>:1672: trailing whitespace. return 0; <stdin>:1674: trailing whitespace. warning: squelched 7 whitespace errors warning: 12 lines add whitespace errors. Falling back to patching base and 3-way merge... warning: too many files (created: 168776 deleted: 3), skipping inexact rename detection Auto-merging LayoutTests/ChangeLog CONFLICT (content): Merge conflict in LayoutTests/ChangeLog Auto-merging Source/WebCore/ChangeLog CONFLICT (content): Merge conflict in Source/WebCore/ChangeLog Auto-merging Source/WebKit2/ChangeLog CONFLICT (content): Merge conflict in Source/WebKit2/ChangeLog Auto-merging Tools/ChangeLog CONFLICT (content): Merge conflict in Tools/ChangeLog Failed to merge in the changes. Patch failed at 0001 [Mac][Win][WK2] Switch to RFC 6455 protocol for WebSockets 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 164. If any of these errors are false positives, please file a bug against check-webkit-style.

Comment on attachment 126958 [details] Patch ok

The commit-queue encountered the following flaky tests while processing attachment 126958 [details]: perf/object-keys.html bug 63769 (author: ojan@chromium.org) The commit-queue is continuing to process your patch.

Comment on attachment 126958 [details] Patch Clearing flags on attachment: 126958 Committed r107782: <http://trac.webkit.org/changeset/107782>

All reviewed patches have been landed. Closing bug.