Bug 24994

Summary:

Upstream miscellaneous upstreaming/merge fixes

Product:

WebKit

Reporter:

Dimitri Glazkov (Google) <dglazkov>

Component:

WebCore Misc.

Assignee:

Nobody <webkit-unassigned>

Status:

RESOLVED FIXED

Severity:

Normal

Priority:

Version:

528+ (Nightly build)

Hardware:

All

OS:

All

Attachments:

Description	Flags
Upstream miscellaneous divergencies	fishd: review+

Description Dimitri Glazkov (Google) 2009-04-01 16:31:29 PDT

This is really minor, but annoying.

Comment 1 Dimitri Glazkov (Google) 2009-04-01 16:35:06 PDT

Created attachment 29180 [details]
Upstream miscellaneous divergencies

 WebCore/ChangeLog                               |   13 +++++++++++++
 WebCore/bindings/v8/V8Collection.h              |    1 +
 WebCore/bindings/v8/V8DOMMap.cpp                |    5 ++---
 WebCore/platform/KURLGoogle.cpp                 |    7 +++++++
 WebCore/platform/chromium/ClipboardChromium.cpp |    1 +
 5 files changed, 24 insertions(+), 3 deletions(-)

Comment 2 Darin Fisher (:fishd, Google) 2009-04-01 16:41:48 PDT

Comment on attachment 29180 [details]
Upstream miscellaneous divergencies

All good except for V8DOMMap.cpp, which is better left as is.  R+

Comment 3 Dimitri Glazkov (Google) 2009-04-01 16:51:38 PDT

Landed as http://trac.webkit.org/changeset/42156 and even http://trac.webkit.org/changeset/42157 for good measure.