Attachment 143579 Details for Bug 85762 – Patch

[patch] Patch

bug-85762-20120523120303.patch (text/plain), 12.56 KB, created by Mark Pilgrim (Google) on 2012-05-23 09:03:29 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Pilgrim (Google)

Created: 2012-05-23 09:03:29 PDT

Size: 12.56 KB

patch

obsolete

>Index: Source/Platform/ChangeLog
>===================================================================
>--- Source/Platform/ChangeLog	(revision 118182)
>+++ Source/Platform/ChangeLog	(working copy)
>@@ -1,3 +1,20 @@
>+2012-05-23  Mark Pilgrim  <pilgrim@chromium.org>
>+
>+        [Chromium] Move queryLocalizedString to Platform.h
>+        https://bugs.webkit.org/show_bug.cgi?id=85762
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Part of a refactoring series. See tracking bug 82948.
>+
>+        * Platform.gypi:
>+        * chromium/public/Platform.h:
>+        (WebKit):
>+        (Platform):
>+        (WebKit::Platform::queryLocalizedString):
>+        * chromium/public/WebLocalizedString.h: Added.
>+        (WebKit):
>+
> 2012-05-22  Mark Pilgrim  <pilgrim@chromium.org>
> 
>         [Chromium] Call canAccelerate2dCanvas directly
>Index: Source/Platform/Platform.gypi
>===================================================================
>--- Source/Platform/Platform.gypi	(revision 118181)
>+++ Source/Platform/Platform.gypi	(working copy)
>@@ -68,6 +68,7 @@
>             'chromium/public/WebLayer.h',
>             'chromium/public/WebLayerTreeView.h',
>             'chromium/public/WebLayerTreeViewClient.h',
>+            'chromium/public/WebLocalizedString.h',
>             'chromium/public/WebMediaHints.h',
>             'chromium/public/WebMediaStreamCenter.h',
>             'chromium/public/WebMediaStreamCenterClient.h',
>Index: Source/Platform/chromium/public/Platform.h
>===================================================================
>--- Source/Platform/chromium/public/Platform.h	(revision 118181)
>+++ Source/Platform/chromium/public/Platform.h	(working copy)
>@@ -36,6 +36,7 @@
> #include "WebData.h"
> #include "WebGamepads.h"
> #include "WebGraphicsContext3D.h"
>+#include "WebLocalizedString.h"
> #include "WebString.h"
> 
> namespace WebKit {
>@@ -46,6 +47,7 @@ class WebClipboard;
> class WebCookieJar;
> class WebFileSystem;
> class WebFileUtilities;
>+class WebLocalizedString;
> class WebMediaStreamCenter;
> class WebMediaStreamCenterClient;
> class WebMimeRegistry;
>@@ -161,6 +163,14 @@ public:
>     virtual void cacheMetadata(const WebURL&, double responseTime, const char* data, size_t dataSize) { }
> 
> 
>+    // Resources -----------------------------------------------------------
>+
>+    // Returns a localized string resource (with substitution parameters).
>+    virtual WebString queryLocalizedString(WebLocalizedString::Name) { return WebString(); }
>+    virtual WebString queryLocalizedString(WebLocalizedString::Name, const WebString& parameter) { return WebString(); }
>+    virtual WebString queryLocalizedString(WebLocalizedString::Name, const WebString& parameter1, const WebString& parameter2) { return WebString(); }
>+
>+
>     // Threads -------------------------------------------------------
> 
>     // Creates an embedder-defined thread.
>Index: Source/Platform/chromium/public/WebLocalizedString.h
>===================================================================
>--- Source/Platform/chromium/public/WebLocalizedString.h	(revision 0)
>+++ Source/Platform/chromium/public/WebLocalizedString.h	(revision 0)
>@@ -0,0 +1,89 @@
>+/*
>+ * Copyright (C) 2009 Google Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions are
>+ * met:
>+ *
>+ *     * Redistributions of source code must retain the above copyright
>+ * notice, this list of conditions and the following disclaimer.
>+ *     * Redistributions in binary form must reproduce the above
>+ * copyright notice, this list of conditions and the following disclaimer
>+ * in the documentation and/or other materials provided with the
>+ * distribution.
>+ *     * Neither the name of Google Inc. nor the names of its
>+ * contributors may be used to endorse or promote products derived from
>+ * this software without specific prior written permission.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#ifndef WebLocalizedString_h
>+#define WebLocalizedString_h
>+
>+namespace WebKit {
>+
>+struct WebLocalizedString {
>+    enum Name {
>+        AXButtonActionVerb,
>+        AXCheckedCheckBoxActionVerb,
>+        AXHeadingText,
>+        AXImageMapText,
>+        AXLinkActionVerb,
>+        AXLinkText,
>+        AXListMarkerText,
>+        AXRadioButtonActionVerb,
>+        AXTextFieldActionVerb,
>+        AXUncheckedCheckBoxActionVerb,
>+        AXWebAreaText,
>+        CalendarClear,
>+        CalendarToday,
>+        DateFormatDayInMonthLabel,
>+        DateFormatMonthLabel,
>+        DateFormatYearLabel,
>+        DetailsLabel,
>+        FileButtonChooseFileLabel,
>+        FileButtonChooseMultipleFilesLabel,
>+        FileButtonNoFileSelectedLabel,
>+        InputElementAltText,
>+        KeygenMenuHighGradeKeySize,
>+        KeygenMenuMediumGradeKeySize,
>+        MissingPluginText,
>+        MultipleFileUploadText,
>+        ResetButtonDefaultLabel,
>+        SearchableIndexIntroduction,
>+        SearchMenuClearRecentSearchesText,
>+        SearchMenuNoRecentSearchesText,
>+        SearchMenuRecentSearchesText,
>+        SubmitButtonDefaultLabel,
>+        ValidationPatternMismatch,
>+        ValidationRangeOverflow,
>+        ValidationRangeUnderflow,
>+        ValidationStepMismatch,
>+        ValidationTooLong,
>+        ValidationTypeMismatch,
>+        ValidationTypeMismatchForEmail,
>+        ValidationTypeMismatchForMultipleEmail,
>+        ValidationTypeMismatchForURL,
>+        ValidationValueMissing,
>+        ValidationValueMissingForCheckbox,
>+        ValidationValueMissingForFile,
>+        ValidationValueMissingForMultipleFile,
>+        ValidationValueMissingForRadio,
>+        ValidationValueMissingForSelect,
>+    };
>+};
>+
>+} // namespace WebKit
>+
>+#endif
>Index: Source/WebKit/chromium/ChangeLog
>===================================================================
>--- Source/WebKit/chromium/ChangeLog	(revision 118182)
>+++ Source/WebKit/chromium/ChangeLog	(working copy)
>@@ -1,3 +1,19 @@
>+2012-05-23  Mark Pilgrim  <pilgrim@chromium.org>
>+
>+        [Chromium] Move queryLocalizedString to Platform.h
>+        https://bugs.webkit.org/show_bug.cgi?id=85762
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Part of a refactoring series. See tracking bug 82948.
>+
>+        * WebKit.gyp:
>+        * public/platform/WebKitPlatformSupport.h:
>+        (WebKit::WebKitPlatformSupport::getPluginList):
>+        * public/platform/WebLocalizedString.h:
>+        * src/LocalizedStrings.cpp:
>+        (WebCore::query):
>+
> 2012-05-22  Alexandre Elias  <aelias@google.com>
> 
>         [chromium] Apply viewport tag initial-scale only once
>Index: Source/WebKit/chromium/WebKit.gyp
>===================================================================
>--- Source/WebKit/chromium/WebKit.gyp	(revision 118181)
>+++ Source/WebKit/chromium/WebKit.gyp	(working copy)
>@@ -317,7 +317,6 @@
>                 'public/platform/WebLayer.h',
>                 'public/platform/WebLayerTreeView.h',
>                 'public/platform/WebLayerTreeViewClient.h',
>-                'public/platform/WebLocalizedString.h',
>                 'public/platform/WebNonCopyable.h',
>                 'public/platform/WebPoint.h',
>                 'public/platform/WebPrivateOwnPtr.h',
>Index: Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h
>===================================================================
>--- Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h	(revision 118181)
>+++ Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h	(working copy)
>@@ -33,7 +33,6 @@
> 
> #include "WebCommon.h"
> #include "WebGraphicsContext3D.h"
>-#include "WebLocalizedString.h"
> #include "WebSerializedScriptValue.h"
> #include "WebString.h"
> #include "WebURL.h"
>@@ -120,14 +119,6 @@ public:
>     virtual void getPluginList(bool refresh, WebPluginListBuilder*) { }
> 
> 
>-    // Resources -----------------------------------------------------------
>-
>-    // Returns a localized string resource (with substitution parameters).
>-    virtual WebString queryLocalizedString(WebLocalizedString::Name) { return WebString(); }
>-    virtual WebString queryLocalizedString(WebLocalizedString::Name, const WebString& parameter) { return WebString(); }
>-    virtual WebString queryLocalizedString(WebLocalizedString::Name, const WebString& parameter1, const WebString& parameter2) { return WebString(); }
>-
>-
>     // Shared Workers ------------------------------------------------------
> 
>     virtual WebSharedWorkerRepository* sharedWorkerRepository() { return 0; }
>Index: Source/WebKit/chromium/public/platform/WebLocalizedString.h
>===================================================================
>--- Source/WebKit/chromium/public/platform/WebLocalizedString.h	(revision 118181)
>+++ Source/WebKit/chromium/public/platform/WebLocalizedString.h	(working copy)
>@@ -28,62 +28,4 @@
>  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#ifndef WebLocalizedString_h
>-#define WebLocalizedString_h
>-
>-namespace WebKit {
>-
>-struct WebLocalizedString {
>-    enum Name {
>-        AXButtonActionVerb,
>-        AXCheckedCheckBoxActionVerb,
>-        AXHeadingText,
>-        AXImageMapText,
>-        AXLinkActionVerb,
>-        AXLinkText,
>-        AXListMarkerText,
>-        AXRadioButtonActionVerb,
>-        AXTextFieldActionVerb,
>-        AXUncheckedCheckBoxActionVerb,
>-        AXWebAreaText,
>-        CalendarClear,
>-        CalendarToday,
>-        DateFormatDayInMonthLabel,
>-        DateFormatMonthLabel,
>-        DateFormatYearLabel,
>-        DetailsLabel,
>-        FileButtonChooseFileLabel,
>-        FileButtonChooseMultipleFilesLabel,
>-        FileButtonNoFileSelectedLabel,
>-        InputElementAltText,
>-        KeygenMenuHighGradeKeySize,
>-        KeygenMenuMediumGradeKeySize,
>-        MissingPluginText,
>-        MultipleFileUploadText,
>-        ResetButtonDefaultLabel,
>-        SearchableIndexIntroduction,
>-        SearchMenuClearRecentSearchesText,
>-        SearchMenuNoRecentSearchesText,
>-        SearchMenuRecentSearchesText,
>-        SubmitButtonDefaultLabel,
>-        ValidationPatternMismatch,
>-        ValidationRangeOverflow,
>-        ValidationRangeUnderflow,
>-        ValidationStepMismatch,
>-        ValidationTooLong,
>-        ValidationTypeMismatch,
>-        ValidationTypeMismatchForEmail,
>-        ValidationTypeMismatchForMultipleEmail,
>-        ValidationTypeMismatchForURL,
>-        ValidationValueMissing,
>-        ValidationValueMissingForCheckbox,
>-        ValidationValueMissingForFile,
>-        ValidationValueMissingForMultipleFile,
>-        ValidationValueMissingForRadio,
>-        ValidationValueMissingForSelect,
>-    };
>-};
>-
>-} // namespace WebKit
>-
>-#endif
>+#include "../../../../Platform/chromium/public/WebLocalizedString.h"
>Index: Source/WebKit/chromium/src/LocalizedStrings.cpp
>===================================================================
>--- Source/WebKit/chromium/src/LocalizedStrings.cpp	(revision 118181)
>+++ Source/WebKit/chromium/src/LocalizedStrings.cpp	(working copy)
>@@ -36,9 +36,9 @@
> 
> #include "WebKit.h"
> #include "platform/WebKitPlatformSupport.h"
>-#include "platform/WebLocalizedString.h"
> #include "platform/WebString.h"
> 
>+#include <public/WebLocalizedString.h>
> #include <wtf/text/StringBuilder.h>
> #include <wtf/text/WTFString.h>
> 
>@@ -49,17 +49,17 @@ namespace WebCore {
> 
> static String query(WebLocalizedString::Name name)
> {
>-    return WebKit::webKitPlatformSupport()->queryLocalizedString(name);
>+    return WebKit::Platform::current()->queryLocalizedString(name);
> }
> 
> static String query(WebLocalizedString::Name name, const WebString& parameter)
> {
>-    return WebKit::webKitPlatformSupport()->queryLocalizedString(name, parameter);
>+    return WebKit::Platform::current()->queryLocalizedString(name, parameter);
> }
> 
> static String query(WebLocalizedString::Name name, const WebString& parameter1, const WebString& parameter2)
> {
>-    return WebKit::webKitPlatformSupport()->queryLocalizedString(name, parameter1, parameter2);
>+    return WebKit::Platform::current()->queryLocalizedString(name, parameter1, parameter2);
> }
> 
> String searchableIndexIntroduction()

Actions: View | Formatted Diff | Diff

Attachments on bug 85762: 140452 | 142026 | 142027 | 143579 | 143828