Djam/chromium-browser-stable-test
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/chromium-browser-stable-test.git synced 2025-02-24 01:52:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update to 35.0.1916.114

Browse source
This commit is contained in:
Tigro 2014-05-21 15:02:27 +04:00
parent d07ac56312
commit d49fe1e627
5 changed files with 2 additions and 273 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -2,4 +2,4 @@ sources:
"icons.tar.bz2": a835954af164bf38f8ea4ea80608839bed7800a3
gn-binaries.tar.xz: 312d6a6addabeed98f3357d34dbc87ccfd43026b
depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5
chromium-34.0.1847.137.tar.xz: 2754eeb95533e7263f51100ce30cca420d1a42c9
chromium-35.0.1916.114.tar.xz: 4e0b101ebb906decbcc33a9a1c80cbed0b0646d7

46
chromium-25.0.1364.172-system-glew.patch
View file

@ -1,46 +0,0 @@
diff -urN chromium-25.0.1364.172.orig/build/linux/system.gyp chromium-25.0.1364.172/build/linux/system.gyp
--- chromium-25.0.1364.172.orig/build/linux/system.gyp 2013-03-25 00:02:19.000000000 +0400
+++ chromium-25.0.1364.172/build/linux/system.gyp 2013-03-25 00:03:46.757371517 +0400
@@ -383,6 +383,42 @@
],
},
{
+ 'target_name': 'icu',
+ 'type': 'none',
+ 'conditions': [
+ ['_toolset=="target"', {
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '-Wno-unused-function',
+ # TODO(port): fix ICU to not depend on this flag.
+ '-fno-strict-aliasing',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '',
+ ],
+ 'libraries': [
+ '-licui18n',
+ ],
+ },
+ }]]
+ },
+ {
+ 'target_name': 'glew',
+ 'type': 'none',
+ 'conditions': [
+ ['_toolset=="target"', {
+ 'link_settings': {
+ 'libraries': [
+ '-lGLEW',
+ '-lGL',
+ '-lX11',
+ ],
+ },
+ }]]
+ },
+ {
'target_name': 'x11',
'type': 'none',
'toolsets': ['host', 'target'],

13
chromium-browser-stable.spec
View file

@ -3,7 +3,7 @@
%define _src %{_topdir}/SOURCES
Name: chromium-browser-stable
Version: 34.0.1847.137
Version: 35.0.1916.114
Release: 1
Summary: A fast webkit-based web browser
Group: Networking/WWW
@ -20,18 +20,11 @@ Source997: depot_tools.tar.xz
Source998: gn-binaries.tar.xz
Patch4: chromium-30.0.1599.66-master-prefs-path.patch
Patch5: chromium-browser-big-icon.patch
# PATCH-FIX-OPENSUSE patches in system glew library
Patch13: chromium-25.0.1364.172-system-glew.patch
# PATCH-FIX-OPENSUSE removes build part for courgette
Patch14: chromium-25.0.1364.172-no-courgette.patch
# PATCH-FIX-OPENSUSE Compile the sandbox with -fPIE settings
Patch15: chromium-25.0.1364.172-sandbox-pie.patch
# Fix https://codereview.chromium.org/142853004/
Patch30: issue142853004_80001_90001.diff
# Fix https://codereview.chromium.org/164553006/ enable fullscreen-within-tab
Patch31: issue164553006_1.diff
Provides: %{crname}
Conflicts: chromium-browser-unstable
Conflicts: chromium-browser-beta
@ -102,13 +95,9 @@ members of the Chromium and WebDriver teams.
%patch4 -p1 -b .prefs
%patch5 -p1 -b .big-icon
%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch30 -p1
%patch31 -p1
# Hard code extra version
FILE=chrome/common/chrome_version_info_posix.cc
sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"%{product_vendor} %{product_version}"/' $FILE

27
issue142853004_80001_90001.diff
View file

@ -1,27 +0,0 @@
Index: build/gyp_chromium
diff --git a/build/gyp_chromium b/build/gyp_chromium
index e4cafc756134c35dc51c7ec3ea111bfef5157653..5c2644ecb374f280d0a775b319757352927b6ad7 100755
--- a/build/gyp_chromium
+++ b/build/gyp_chromium
@@ -39,7 +39,8 @@ sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'liblouis'))
sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'WebKit',
'Source', 'build', 'scripts'))
-import find_depot_tools
+if os.environ.get('GYP_GENERATORS') != 'make':
+ import find_depot_tools
# On Windows, Psyco shortens warm runs of build/gyp_chromium by about
# 20 seconds on a z600 machine with 12 GB of RAM, from 90 down to 70
@@ -474,8 +475,9 @@ if __name__ == '__main__':
args.append('--check')
supplemental_includes = GetSupplementalFiles()
- if not RunGN(supplemental_includes):
- sys.exit(1)
+ if os.environ.get('GYP_GENERATORS') != 'make':
+ if not RunGN(supplemental_includes):
+ sys.exit(1)
args.extend(
['-I' + i for i in additional_include_files(supplemental_includes, args)])

187
issue164553006_1.diff
View file

@ -1,187 +0,0 @@
Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index f57f2b04652bb8b97afdd1ec87977b665a686f12..3d41daf6a6bca2fcbe27a2fc3cb78cd5e1b93ba1 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6985,12 +6985,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_FLAGS_ENABLE_PASSWORD_BUBBLE_DESCRIPTION" desc="Description for the flag to enable the Manage Passwords Bubble feature.">
Enables the Passwords Bubble. The Passwords Bubble provides an easy way to store and manage passwords for a website. It replaced the infobad for saving passwords.
</message>
- <message name="IDS_FLAGS_FULLSCREEN_WITHIN_TAB_NAME" desc="Name of about:flags option to enable new fullscreen-within-tab behaviors.">
- Fullscreen-within-tab UI
- </message>
- <message name="IDS_FLAGS_FULLSCREEN_WITHIN_TAB_DESCRIPTION" desc="Description for the about:flags option to enable new fullscreen-within-tab behaviors.">
- When enabled, Pepper/Flash fullscreen widgets are embedded within the browser window to make the fullscreen user experience consistent with all other browser fullscreen modes. In addition, while screen-capturing a tab, the browser window will not fullscreen. This allows the user to retain control of their desktop to work in other browser tabs or applications.
- </message>
<message name="IDS_FLAGS_ENABLE_PERMISSIONS_BUBBLES_NAME" desc="Title for the flag to enable showing permissions requests in bubbles.">
Use Bubbles for Permission Requests
</message>
Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index cf5fcf4c1b40f028ed75abc33c059eaf19512bfc..52ca59c5598bb3f777ed67d683f2a8880fee1475 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1910,15 +1910,6 @@ const Experiment kExperiments[] = {
kOsWin | kOsCrOS,
SINGLE_VALUE_TYPE(switches::kEnableSavePasswordBubble)
},
-#endif
- {
- "fullscreen-within-tab",
- IDS_FLAGS_FULLSCREEN_WITHIN_TAB_NAME,
- IDS_FLAGS_FULLSCREEN_WITHIN_TAB_DESCRIPTION,
- kOsDesktop,
- SINGLE_VALUE_TYPE(switches::kEmbedFlashFullscreen)
- },
-#if defined(USE_AURA) || defined(OS_WIN)
{
"enable-permissions-bubbles",
IDS_FLAGS_ENABLE_PERMISSIONS_BUBBLES_NAME,
Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 6c80736f5736ab8e1014a8e85e1dcb2a403eb41f..900bbc080cf40f907b9bbb6efa135ed9396a0193 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -1572,8 +1572,8 @@ void Browser::EnumerateDirectory(WebContents* web_contents,
}
bool Browser::EmbedsFullscreenWidget() const {
- return CommandLine::ForCurrentProcess()->
- HasSwitch(switches::kEmbedFlashFullscreen);
+ return !CommandLine::ForCurrentProcess()->
+ HasSwitch(switches::kDisableFullscreenWithinTab);
}
void Browser::ToggleFullscreenModeForTab(WebContents* web_contents,
Index: chrome/browser/ui/fullscreen/fullscreen_controller_state_unittest.cc
diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_state_unittest.cc b/chrome/browser/ui/fullscreen/fullscreen_controller_state_unittest.cc
index 7d873e8c31071ad067074521f39d2b26671e0103..8e441137c21d4c54f0800b8f8e783a15ed35f6a7 100644
--- a/chrome/browser/ui/fullscreen/fullscreen_controller_state_unittest.cc
+++ b/chrome/browser/ui/fullscreen/fullscreen_controller_state_unittest.cc
@@ -9,7 +9,6 @@
#include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
#include "chrome/browser/ui/fullscreen/fullscreen_controller_state_test.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/common/chrome_switches.h"
#include "chrome/test/base/browser_with_test_window_test.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_view.h"
@@ -485,11 +484,12 @@ TEST_F(FullscreenControllerStateUnitTest, ExitTabFullscreenViaReplacingTab) {
//
// See 'FullscreenWithinTab Note' in fullscreen_controller.h.
TEST_F(FullscreenControllerStateUnitTest, OneCapturedFullscreenedTab) {
- CommandLine::ForCurrentProcess()->
- AppendSwitch(switches::kEmbedFlashFullscreen);
content::WebContentsDelegate* const wc_delegate =
static_cast<content::WebContentsDelegate*>(browser());
- ASSERT_TRUE(wc_delegate->EmbedsFullscreenWidget());
+ if (!wc_delegate->EmbedsFullscreenWidget()) {
+ LOG(WARNING) << "Skipping test since fullscreen-within-tab is disabled.";
+ return;
+ }
AddTab(browser(), GURL(content::kAboutBlankURL));
AddTab(browser(), GURL(content::kAboutBlankURL));
@@ -551,11 +551,12 @@ TEST_F(FullscreenControllerStateUnitTest, OneCapturedFullscreenedTab) {
//
// See 'FullscreenWithinTab Note' in fullscreen_controller.h.
TEST_F(FullscreenControllerStateUnitTest, TwoFullscreenedTabsOneCaptured) {
- CommandLine::ForCurrentProcess()->
- AppendSwitch(switches::kEmbedFlashFullscreen);
content::WebContentsDelegate* const wc_delegate =
static_cast<content::WebContentsDelegate*>(browser());
- ASSERT_TRUE(wc_delegate->EmbedsFullscreenWidget());
+ if (!wc_delegate->EmbedsFullscreenWidget()) {
+ LOG(WARNING) << "Skipping test since fullscreen-within-tab is disabled.";
+ return;
+ }
AddTab(browser(), GURL(content::kAboutBlankURL));
AddTab(browser(), GURL(content::kAboutBlankURL));
@@ -611,11 +612,12 @@ TEST_F(FullscreenControllerStateUnitTest, TwoFullscreenedTabsOneCaptured) {
// See 'FullscreenWithinTab Note' in fullscreen_controller.h.
TEST_F(FullscreenControllerStateUnitTest,
BackgroundCapturedTabExitsFullscreen) {
- CommandLine::ForCurrentProcess()->
- AppendSwitch(switches::kEmbedFlashFullscreen);
content::WebContentsDelegate* const wc_delegate =
static_cast<content::WebContentsDelegate*>(browser());
- ASSERT_TRUE(wc_delegate->EmbedsFullscreenWidget());
+ if (!wc_delegate->EmbedsFullscreenWidget()) {
+ LOG(WARNING) << "Skipping test since fullscreen-within-tab is disabled.";
+ return;
+ }
AddTab(browser(), GURL(content::kAboutBlankURL));
AddTab(browser(), GURL(content::kAboutBlankURL));
@@ -669,11 +671,12 @@ TEST_F(FullscreenControllerStateUnitTest,
// See 'FullscreenWithinTab Note' in fullscreen_controller.h.
TEST_F(FullscreenControllerStateUnitTest,
OneCapturedTabFullscreenedBeforeBrowserFullscreen) {
- CommandLine::ForCurrentProcess()->
- AppendSwitch(switches::kEmbedFlashFullscreen);
content::WebContentsDelegate* const wc_delegate =
static_cast<content::WebContentsDelegate*>(browser());
- ASSERT_TRUE(wc_delegate->EmbedsFullscreenWidget());
+ if (!wc_delegate->EmbedsFullscreenWidget()) {
+ LOG(WARNING) << "Skipping test since fullscreen-within-tab is disabled.";
+ return;
+ }
AddTab(browser(), GURL(content::kAboutBlankURL));
content::WebContents* const tab =
Index: chrome/common/chrome_switches.cc
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index d816fd8cc193e13ad486e21932bfb0cb404e98ee..31714e4fa848e4e8776e531cafb5e0495b92c34a 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -343,6 +343,13 @@ const char kDisableExtensionsHttpThrottling[] =
const char kDisableExtensionsResourceWhitelist[] =
"disable-extensions-resource-whitelist";
+// Disables embedding of Flash fullscreen widgets within the browser window.
+// This restores the old code paths where Flash fullscreen would display in its
+// own separate, always-on-top window. In addition, this disables the new logic
+// which would prevent fullscreening the browser window during screen-capture of
+// a tab. http://crbug.com/256870 and http://crbug.com/290403
+const char kDisableFullscreenWithinTab[] = "disable-fullscreen-within-tab";
+
// Disables Google Now integration.
const char kDisableGoogleNowIntegration[] = "disable-google-now-integration";
@@ -529,14 +536,6 @@ const char kDnsPrefetchDisable[] = "dns-prefetch-disable";
// given file. The file is overwritten if it exists.
const char kDumpBrowserHistograms[] = "dump-browser-histograms";
-// If set, Flash fullscreen widgets are embedded within the browser window and
-// with the same UX as HTML5 fullscreen.
-//
-// TODO(miu): This feature is a work in-progress. It should not be enabled by
-// default until going through a formal UX review, and all comments/concerns on
-// the crbug are addressed. http://crbug.com/290403
-const char kEmbedFlashFullscreen[] = "embed-flash-fullscreen";
-
// Enables the <adview> tag in packaged apps.
const char kEnableAdview[] = "enable-adview";
Index: chrome/common/chrome_switches.h
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 93e3e80160f182fe0f9b46389782c04044f4993a..895d36d71d6840434ed9dd99932dc8c855177924 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -104,6 +104,7 @@ extern const char kDisableExtensionsFileAccessCheck[];
extern const char kDisableExtensionsHttpThrottling[];
extern const char kDisableExtensionsResourceWhitelist[];
extern const char kDisableExtensions[];
+extern const char kDisableFullscreenWithinTab[];
extern const char kDisableGoogleNowIntegration[];
extern const char kDisableImprovedDownloadProtection[];
extern const char kDisableIPv6[];
@@ -157,7 +158,6 @@ extern const char kDiskCacheSize[];
extern const char kDnsLogDetails[];
extern const char kDnsPrefetchDisable[];
extern const char kDumpBrowserHistograms[];
-extern const char kEmbedFlashFullscreen[];
extern const char kEnableAdview[];
extern const char kEnableAppList[];
extern const char kEnableAppWindowControls[];