Merge lp:~mterry/oxide/mirserver-1.5 into lp:~oxide-developers/oxide/oxide.trunk

[Michael Terry]

Recognize "mirserver" as a valid ubuntu platform type, and use the GLES2 implementation in that case.

Recognize "mirserver" as a valid ubuntu platform type, and use the GLES2 implementation in that case.

Same fix as https://code.launchpad.net/~mterry/oxide/mirserver/+merge/255128 but for 1.5

Unmerged revisions

974. By Michael Terry on 2015-04-10

Support mirserver as a QPA platform, to fix a crash in the wizard

973. By Chris Coulson on 2015-04-02

Automatically bump qt revision to 1.5.7

972. By Chris Coulson on 2015-04-02

LP: #1431484

971. By Chris Coulson on 2015-04-02

Bump Chromium rev to 41.0.2272.118

970. By Chris Coulson on 2015-03-12

Bump Chromium rev to 41.0.2272.89

969. By Chris Coulson on 2015-03-09

r908 fixed builds with Qt5.4 but broke builds with < Qt5.3. However, this wasn't picked up because those builds were inadvertently fixed again by r949 which unfortunately landed after 1.5 was branched. Backport r949 from trunk, effectively dropping support for < Qt5.2 but fixing the build with Qt5.2 (trusty)

968. By Chris Coulson on 2015-03-05

Disable webcore debug symbols and link with --no-keep-files-mapped on native x86 builds because of linker OOM

967. By Chris Coulson on 2015-03-05

Automatically bump qt revision to 1.5.6

966. By Chris Coulson on 2015-03-05

Backport commit 7431bb2983db683dcc4556e1918556254c3d5589 from upstream chromium branch 42 and corresponding unit tests

965. By Chris Coulson on 2015-03-05

Backport revisions from trunk to fix the scrollbar styling on mobile

=== modified file 'CHROMIUM_VERSION'
--- CHROMIUM_VERSION	2015-04-06 21:26:49 +0000
+++ CHROMIUM_VERSION	2015-04-10 12:47:19 +0000
@@ -1,1 +1,5 @@
+<<<<<<< TREE
 43.0.2357.2
+=======
+41.0.2272.118
+>>>>>>> MERGE-SOURCE

=== modified file 'build/common.gypi'
--- build/common.gypi	2015-03-05 16:07:04 +0000
+++ build/common.gypi	2015-04-10 12:47:19 +0000
@@ -51,7 +51,11 @@
         # Ubuntu-specific?
         'arm_float_abi': 'hard',
       }],
+<<<<<<< TREE
       ['(host_arch=="arm" or host_arch=="ia32") and component=="static_library"', {
+=======
+      ['host_arch=="arm" or host_arch=="ia32"', {
+>>>>>>> MERGE-SOURCE
         # This is desparate - we're trying to avoid linker OOM on native ARM
         # and x86 builds. This is unnecessary on ARM cross builds, hence the
         # test for "host_arch".
@@ -74,10 +78,20 @@
           '-Wl,--stats',
         ],
       }],
+<<<<<<< TREE
       ['(host_arch=="arm" or host_arch=="ia32") and component=="static_library"', {
+=======
+      ['host_arch=="arm" or host_arch=="ia32"', {
+>>>>>>> MERGE-SOURCE
         'ldflags': [
           # Try to work around linker OOM - we only want these on native
-          # ARM and x86 builds though, hence the test for "host_arch"
+<<<<<<< TREE
+          # ARM and x86 builds though, hence the test for "host_arch"
+=======
+          # ARM and x86 builds though, hence the test for "host_arch"
+          '-Wl,--no-map-whole-files',
+          '-Wl,--no-keep-memory',
+>>>>>>> MERGE-SOURCE
           '-Wl,--no-keep-files-mapped',
         ],
       }],

=== modified file 'patches/allow-os-override-for-gpu-manager.patch'
--- patches/allow-os-override-for-gpu-manager.patch	2015-04-03 21:58:38 +0000
+++ patches/allow-os-override-for-gpu-manager.patch	2015-04-10 12:47:19 +0000
@@ -52,6 +52,7 @@
    NotifyGpuInfoUpdate();
  }
  
+<<<<<<< TREE
 @@ -917,32 +918,37 @@ GpuDataManagerImplPrivate::GpuDataManage
        use_warp_(false),
        card_blacklisted_(false),
@@ -161,6 +162,117 @@
  
  #endif  // CONTENT_BROWSER_GPU_GPU_DATA_MANAGER_IMPL_PRIVATE_H_
  
+=======
+@@ -905,32 +906,37 @@ GpuDataManagerImplPrivate::GpuDataManage
+       use_warp_(false),
+       card_blacklisted_(false),
+       update_histograms_(true),
+       window_count_(0),
+       domain_blocking_enabled_(true),
+       owner_(owner),
+       display_count_(0),
+       gpu_process_accessible_(true),
+-      finalized_(false) {
++      finalized_(false),
++      os_type_override_(gpu::GpuControlList::kOsAny) {
+   DCHECK(owner_);
+   const base::CommandLine* command_line =
+       base::CommandLine::ForCurrentProcess();
+   if (command_line->HasSwitch(switches::kDisableGpu))
+     DisableHardwareAcceleration();
+ 
+ #if defined(OS_MACOSX)
+   CGGetActiveDisplayList (0, NULL, &display_count_);
+   CGDisplayRegisterReconfigurationCallback(DisplayReconfigCallback, owner_);
+ #endif  // OS_MACOSX
+ 
+   // For testing only.
+   if (command_line->HasSwitch(switches::kDisableDomainBlockingFor3DAPIs)) {
+     domain_blocking_enabled_ = false;
+   }
++
++  os_type_override_ =
++      GetContentClient()->browser()->GetOsTypeOverrideForGpuDataManager(
++        &os_version_override_);
+ }
+ 
+ GpuDataManagerImplPrivate::~GpuDataManagerImplPrivate() {
+ #if defined(OS_MACOSX)
+   CGDisplayRemoveReconfigurationCallback(DisplayReconfigCallback, owner_);
+ #endif
+ }
+ 
+@@ -942,25 +948,27 @@ void GpuDataManagerImplPrivate::Initiali
+       base::CommandLine::ForCurrentProcess()->HasSwitch(
+           switches::kLogGpuControlListDecisions);
+ 
+   if (!gpu_blacklist_json.empty()) {
+     gpu_blacklist_.reset(gpu::GpuBlacklist::Create());
+     if (log_gpu_control_list_decisions)
+       gpu_blacklist_->enable_control_list_logging("gpu_blacklist");
+     bool success = gpu_blacklist_->LoadList(
+-        gpu_blacklist_json, gpu::GpuControlList::kCurrentOsOnly);
++        gpu_blacklist_json, gpu::GpuControlList::kCurrentOsOnly,
++        os_type_override_);
+     DCHECK(success);
+   }
+   if (!gpu_driver_bug_list_json.empty()) {
+     gpu_driver_bug_list_.reset(gpu::GpuDriverBugList::Create());
+     if (log_gpu_control_list_decisions)
+       gpu_driver_bug_list_->enable_control_list_logging("gpu_driver_bug_list");
+     bool success = gpu_driver_bug_list_->LoadList(
+-        gpu_driver_bug_list_json, gpu::GpuControlList::kCurrentOsOnly);
++        gpu_driver_bug_list_json, gpu::GpuControlList::kCurrentOsOnly,
++        os_type_override_);
+     DCHECK(success);
+   }
+ 
+   gpu_info_ = gpu_info;
+   UpdateGpuInfo(gpu_info);
+   UpdateGpuSwitchingManager(gpu_info);
+   UpdatePreliminaryBlacklistedFeatures();
+ }
+diff --git a/content/browser/gpu/gpu_data_manager_impl_private.h b/content/browser/gpu/gpu_data_manager_impl_private.h
+--- a/content/browser/gpu/gpu_data_manager_impl_private.h
++++ b/content/browser/gpu/gpu_data_manager_impl_private.h
+@@ -11,16 +11,17 @@
+ #include <string>
+ #include <vector>
+ 
+ #include "base/memory/ref_counted.h"
+ #include "base/memory/singleton.h"
+ #include "base/observer_list_threadsafe.h"
+ #include "content/browser/gpu/gpu_data_manager_impl.h"
+ #include "gpu/config/gpu_blacklist.h"
++#include "gpu/config/gpu_control_list.h"
+ #include "gpu/config/gpu_driver_bug_list.h"
+ 
+ namespace base {
+ class CommandLine;
+ }
+ 
+ namespace content {
+ 
+@@ -265,15 +266,18 @@ class CONTENT_EXPORT GpuDataManagerImplP
+ 
+   unsigned int display_count_;
+ 
+   bool gpu_process_accessible_;
+ 
+   // True if all future Initialize calls should be ignored.
+   bool finalized_;
+ 
++  gpu::GpuControlList::OsType os_type_override_;
++  std::string os_version_override_;
++
+   DISALLOW_COPY_AND_ASSIGN(GpuDataManagerImplPrivate);
+ };
+ 
+ }  // namespace content
+ 
+ #endif  // CONTENT_BROWSER_GPU_GPU_DATA_MANAGER_IMPL_PRIVATE_H_
+ 
+>>>>>>> MERGE-SOURCE
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
@@ -218,6 +330,7 @@
  }  // namespace content
  
  #endif  // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
+<<<<<<< TREE
 diff --git a/gpu/config/gpu_control_list.cc b/gpu/config/gpu_control_list.cc
 --- a/gpu/config/gpu_control_list.cc
 +++ b/gpu/config/gpu_control_list.cc
@@ -319,3 +432,106 @@
    std::string version_;
    std::vector<ScopedGpuControlListEntry> entries_;
  
+=======
+diff --git a/gpu/config/gpu_control_list.cc b/gpu/config/gpu_control_list.cc
+--- a/gpu/config/gpu_control_list.cc
++++ b/gpu/config/gpu_control_list.cc
+@@ -1327,30 +1327,32 @@ GpuControlList::GpuControlList()
+ }
+ 
+ GpuControlList::~GpuControlList() {
+   Clear();
+ }
+ 
+ bool GpuControlList::LoadList(
+     const std::string& json_context,
+-    GpuControlList::OsFilter os_filter) {
++    GpuControlList::OsFilter os_filter,
++    GpuControlList::OsType os_override) {
+   scoped_ptr<base::Value> root;
+   root.reset(base::JSONReader::Read(json_context));
+   if (root.get() == NULL || !root->IsType(base::Value::TYPE_DICTIONARY))
+     return false;
+ 
+   base::DictionaryValue* root_dictionary =
+       static_cast<base::DictionaryValue*>(root.get());
+   DCHECK(root_dictionary);
+-  return LoadList(*root_dictionary, os_filter);
++  return LoadList(*root_dictionary, os_filter, os_override);
+ }
+ 
+ bool GpuControlList::LoadList(const base::DictionaryValue& parsed_json,
+-                              GpuControlList::OsFilter os_filter) {
++                              GpuControlList::OsFilter os_filter,
++                              GpuControlList::OsType os_override) {
+   std::vector<ScopedGpuControlListEntry> entries;
+ 
+   parsed_json.GetString("version", &version_);
+   std::vector<std::string> pieces;
+   if (!ProcessVersionString(version_, '.', &pieces))
+     return false;
+ 
+   const base::ListValue* list = NULL;
+@@ -1368,17 +1370,19 @@ bool GpuControlList::LoadList(const base
+     if (entry.get() == NULL)
+       return false;
+     if (entry->id() > max_entry_id)
+       max_entry_id = entry->id();
+     entries.push_back(entry);
+   }
+ 
+   Clear();
+-  OsType my_os = GetOsType();
++  OsType my_os = os_override;
++  if (my_os == kOsAny)
++    my_os = GetOsType();
+   for (size_t i = 0; i < entries.size(); ++i) {
+     OsType entry_os = entries[i]->GetOsType();
+     if (os_filter == GpuControlList::kAllOs ||
+         entry_os == kOsAny || entry_os == my_os)
+       entries_.push_back(entries[i]);
+   }
+   max_entry_id_ = max_entry_id;
+   return true;
+diff --git a/gpu/config/gpu_control_list.h b/gpu/config/gpu_control_list.h
+--- a/gpu/config/gpu_control_list.h
++++ b/gpu/config/gpu_control_list.h
+@@ -40,17 +40,17 @@ class GPU_EXPORT GpuControlList {
+     kAllOs
+   };
+ 
+   GpuControlList();
+   virtual ~GpuControlList();
+ 
+   // Loads control list information from a json file.
+   // If failed, the current GpuControlList is un-touched.
+-  bool LoadList(const std::string& json_context, OsFilter os_filter);
++  bool LoadList(const std::string& json_context, OsFilter os_filter, OsType os_override = kOsAny);
+ 
+   // Collects system information and combines them with gpu_info and control
+   // list information to decide which entries are applied to the current
+   // system and returns the union of features specified in each entry.
+   // If os is kOsAny, use the current OS; if os_version is empty, use the
+   // current OS version.
+   std::set<int> MakeDecision(
+       OsType os, std::string os_version, const GPUInfo& gpu_info);
+@@ -451,17 +451,17 @@ class GPU_EXPORT GpuControlList {
+     scoped_ptr<BoolInfo> direct_rendering_info_;
+     std::set<int> features_;
+     std::vector<ScopedGpuControlListEntry> exceptions_;
+   };
+ 
+   // Gets the current OS type.
+   static OsType GetOsType();
+ 
+-  bool LoadList(const base::DictionaryValue& parsed_json, OsFilter os_filter);
++  bool LoadList(const base::DictionaryValue& parsed_json, OsFilter os_filter, OsType os_override);
+ 
+   void Clear();
+ 
+   static NumericOp StringToNumericOp(const std::string& op);
+ 
+   std::string version_;
+   std::vector<ScopedGpuControlListEntry> entries_;
+ 
+>>>>>>> MERGE-SOURCE

=== modified file 'patches/allow-render-widget-compositor-settings-override.patch'
--- patches/allow-render-widget-compositor-settings-override.patch	2015-04-03 21:58:38 +0000
+++ patches/allow-render-widget-compositor-settings-override.patch	2015-04-10 12:47:19 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 # Description: Allow the embedder to override the renderer compositor
 #  settings
 # Author: Chris Coulson <[e-mail]>
@@ -101,3 +102,108 @@
    } else {
      layer_tree_host_ = cc::LayerTreeHost::CreateSingleThreaded(
          this, this, shared_bitmap_manager, gpu_memory_buffer_manager,
+=======
+# Description: Allow the embedder to override the renderer compositor
+#  settings
+# Author: Chris Coulson <[e-mail]>
+
+diff --git a/content/public/renderer/content_renderer_client.cc b/content/public/renderer/content_renderer_client.cc
+--- a/content/public/renderer/content_renderer_client.cc
++++ b/content/public/renderer/content_renderer_client.cc
+@@ -216,9 +216,12 @@ std::string ContentRendererClient::GetUs
+ blink::WebMediaPlayer* ContentRendererClient::OverrideWebMediaPlayer(
+     blink::WebFrame* frame,
+     blink::WebMediaPlayerClient* client,
+     base::WeakPtr<media::WebMediaPlayerDelegate> delegate,
+     media::MediaLog* media_log) {
+   return nullptr;
+ }
+ 
++void ContentRendererClient::OverrideCompositorSettings(
++    cc::LayerTreeSettings* settings) {}
++
+ }  // namespace content
+diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
+--- a/content/public/renderer/content_renderer_client.h
++++ b/content/public/renderer/content_renderer_client.h
+@@ -49,16 +49,20 @@ class WebSpeechSynthesizer;
+ class WebSpeechSynthesizerClient;
+ class WebThemeEngine;
+ class WebURLRequest;
+ class WebWorkerPermissionClientProxy;
+ struct WebPluginParams;
+ struct WebURLError;
+ }
+ 
++namespace cc {
++class LayerTreeSettings;
++}
++
+ namespace media {
+ class MediaLog;
+ class RendererFactory;
+ class WebMediaPlayerDelegate;
+ struct KeySystemInfo;
+ }
+ 
+ namespace content {
+@@ -301,13 +305,16 @@ class CONTENT_EXPORT ContentRendererClie
+   virtual std::string GetUserAgentOverrideForURL(const GURL& url);
+ 
+   // Allow overriding default media player
+   virtual blink::WebMediaPlayer* OverrideWebMediaPlayer(
+       blink::WebFrame* frame,
+       blink::WebMediaPlayerClient* client,
+       base::WeakPtr<media::WebMediaPlayerDelegate> delegate,
+       media::MediaLog* media_log);
++
++  // Allow overriding the renderer compositor settings
++  virtual void OverrideCompositorSettings(cc::LayerTreeSettings* settings);
+ };
+ 
+ }  // namespace content
+ 
+ #endif  // CONTENT_PUBLIC_RENDERER_CONTENT_RENDERER_CLIENT_H_
+diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
+--- a/content/renderer/gpu/render_widget_compositor.cc
++++ b/content/renderer/gpu/render_widget_compositor.cc
+@@ -26,17 +26,19 @@
+ #include "cc/output/begin_frame_args.h"
+ #include "cc/output/copy_output_request.h"
+ #include "cc/output/copy_output_result.h"
+ #include "cc/resources/single_release_callback.h"
+ #include "cc/scheduler/begin_frame_source.h"
+ #include "cc/trees/layer_tree_host.h"
+ #include "content/common/content_switches_internal.h"
+ #include "content/common/gpu/client/context_provider_command_buffer.h"
++#include "content/public/common/content_client.h"
+ #include "content/public/common/content_switches.h"
++#include "content/public/renderer/content_renderer_client.h"
+ #include "content/renderer/input/input_handler_manager.h"
+ #include "content/renderer/scheduler/renderer_scheduler.h"
+ #include "gpu/command_buffer/client/gles2_interface.h"
+ #include "third_party/WebKit/public/platform/WebCompositeAndReadbackAsyncCallback.h"
+ #include "third_party/WebKit/public/platform/WebSelectionBound.h"
+ #include "third_party/WebKit/public/platform/WebSize.h"
+ #include "third_party/WebKit/public/web/WebKit.h"
+ #include "third_party/WebKit/public/web/WebWidget.h"
+@@ -424,16 +426,18 @@ void RenderWidgetCompositor::Initialize(
+       compositor_deps_->GetGpuMemoryBufferManager();
+ 
+   scoped_ptr<cc::BeginFrameSource> external_begin_frame_source;
+   if (settings.use_external_begin_frame_source) {
+     external_begin_frame_source =
+         compositor_deps_->CreateExternalBeginFrameSource(widget_->routing_id());
+   }
+ 
++  GetContentClient()->renderer()->OverrideCompositorSettings(&settings);
++
+   if (compositor_thread_task_runner.get()) {
+     layer_tree_host_ = cc::LayerTreeHost::CreateThreaded(
+         this, shared_bitmap_manager, gpu_memory_buffer_manager, settings,
+         main_thread_compositor_task_runner, compositor_thread_task_runner,
+         external_begin_frame_source.Pass());
+   } else {
+     layer_tree_host_ = cc::LayerTreeHost::CreateSingleThreaded(
+         this, this, shared_bitmap_manager, gpu_memory_buffer_manager, settings,
+>>>>>>> MERGE-SOURCE

=== added file 'patches/bug1423531.patch'
--- patches/bug1423531.patch	1970-01-01 00:00:00 +0000
+++ patches/bug1423531.patch	2015-04-10 12:47:19 +0000
@@ -0,0 +1,202 @@
+# Description: backport commit 7431bb2983db683dcc4556e1918556254c3d5589
+#  from the 42 branch to fix https://launchpad.net/bugs/1423531
+# Author: Olivier Tilloy <[e-mail]>
+
+diff --git a/chrome/browser/ui/zoom/zoom_controller_browsertest.cc b/chrome/browser/ui/zoom/zoom_controller_browsertest.cc
+--- a/chrome/browser/ui/zoom/zoom_controller_browsertest.cc
++++ b/chrome/browser/ui/zoom/zoom_controller_browsertest.cc
+@@ -8,6 +8,7 @@
+ #include "base/process/kill.h"
+ #include "chrome/browser/profiles/profile.h"
+ #include "chrome/browser/ui/browser.h"
++#include "chrome/browser/ui/browser_commands.h"
+ #include "chrome/browser/ui/tabs/tab_strip_model.h"
+ #include "chrome/browser/ui/webui/signin/login_ui_test_utils.h"
+ #include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h"
+@@ -140,6 +141,57 @@
+   EXPECT_FLOAT_EQ(new_zoom_level, zoom_controller->GetZoomLevel());
+ }
+ 
++IN_PROC_BROWSER_TEST_F(ZoomControllerBrowserTest,
++                       ErrorPagesCanZoomAfterTabRestore) {
++  // This url is meant to cause a network error page to be loaded.
++  // Tests can't reach the network, so this test should continue
++  // to work even if the domain listed is someday registered.
++  GURL url("http://kjfhkjsdf.com");
++
++  TabStripModel* tab_strip = browser()->tab_strip_model();
++  ASSERT_TRUE(tab_strip);
++
++  ui_test_utils::NavigateToURLWithDisposition(
++      browser(), url, NEW_FOREGROUND_TAB,
++      ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
++  {
++    content::WebContents* web_contents = tab_strip->GetActiveWebContents();
++
++    EXPECT_EQ(
++        content::PAGE_TYPE_ERROR,
++        web_contents->GetController().GetLastCommittedEntry()->GetPageType());
++
++    content::WebContentsDestroyedWatcher destroyed_watcher(web_contents);
++    tab_strip->CloseWebContentsAt(tab_strip->active_index(),
++                                  TabStripModel::CLOSE_CREATE_HISTORICAL_TAB);
++    destroyed_watcher.Wait();
++  }
++  EXPECT_EQ(1, tab_strip->count());
++
++  content::WebContentsAddedObserver new_web_contents_observer;
++  chrome::RestoreTab(browser());
++  content::WebContents* web_contents =
++      new_web_contents_observer.GetWebContents();
++  content::WaitForLoadStop(web_contents);
++
++  EXPECT_EQ(2, tab_strip->count());
++
++  EXPECT_EQ(
++      content::PAGE_TYPE_ERROR,
++      web_contents->GetController().GetLastCommittedEntry()->GetPageType());
++
++  ZoomController* zoom_controller =
++      ZoomController::FromWebContents(web_contents);
++
++  double old_zoom_level = zoom_controller->GetZoomLevel();
++  double new_zoom_level = old_zoom_level + 0.5;
++
++  // The following attempt to change the zoom level for an error page should
++  // fail.
++  zoom_controller->SetZoomLevel(new_zoom_level);
++  EXPECT_FLOAT_EQ(new_zoom_level, zoom_controller->GetZoomLevel());
++}
++
+ IN_PROC_BROWSER_TEST_F(ZoomControllerBrowserTest, Observe) {
+   content::WebContents* web_contents =
+       browser()->tab_strip_model()->GetActiveWebContents();
+diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc
+--- a/content/browser/frame_host/navigation_controller_impl.cc
++++ b/content/browser/frame_host/navigation_controller_impl.cc
+@@ -1050,10 +1050,6 @@
+        pending_entry_->site_instance() == rfh->GetSiteInstance())) {
+     new_entry = new NavigationEntryImpl(*pending_entry_);
+ 
+-    // Don't use the page type from the pending entry. Some interstitial page
+-    // may have set the type to interstitial. Once we commit, however, the page
+-    // type must always be normal.
+-    new_entry->set_page_type(PAGE_TYPE_NORMAL);
+     update_virtual_url = new_entry->update_virtual_url_with_url();
+   } else {
+     new_entry = new NavigationEntryImpl;
+@@ -1074,8 +1070,12 @@
+     update_virtual_url = needs_update;
+   }
+ 
+-  if (params.url_is_unreachable)
+-    new_entry->set_page_type(PAGE_TYPE_ERROR);
++  // Don't use the page type from the pending entry. Some interstitial page
++  // may have set the type to interstitial. Once we commit, however, the page
++  // type must always be normal or error.
++  new_entry->set_page_type(params.url_is_unreachable ? PAGE_TYPE_ERROR
++                                                     : PAGE_TYPE_NORMAL);
++
+   new_entry->SetURL(params.url);
+   if (update_virtual_url)
+     UpdateVirtualURLToURL(new_entry, params.url);
+@@ -1126,6 +1126,8 @@
+   NavigationEntryImpl* entry = entries_[entry_index].get();
+ 
+   // The URL may have changed due to redirects.
++  entry->set_page_type(params.url_is_unreachable ? PAGE_TYPE_ERROR
++                                                 : PAGE_TYPE_NORMAL);
+   entry->SetURL(params.url);
+   entry->SetReferrer(params.referrer);
+   if (entry->update_virtual_url_with_url())
+@@ -1178,6 +1180,8 @@
+   existing_entry->set_unique_id(pending_entry_->GetUniqueID());
+ 
+   // The URL may have changed due to redirects.
++  existing_entry->set_page_type(params.url_is_unreachable ? PAGE_TYPE_ERROR
++                                                          : PAGE_TYPE_NORMAL);
+   if (existing_entry->update_virtual_url_with_url())
+     UpdateVirtualURLToURL(existing_entry, params.url);
+   existing_entry->SetURL(params.url);
+@@ -1204,6 +1208,8 @@
+   // entry and it will be the same page as the new navigation (minus the
+   // reference fragments, of course).  We'll update the URL of the existing
+   // entry without pruning the forward history.
++  existing_entry->set_page_type(params.url_is_unreachable ? PAGE_TYPE_ERROR
++                                                          : PAGE_TYPE_NORMAL);
+   existing_entry->SetURL(params.url);
+   if (existing_entry->update_virtual_url_with_url())
+     UpdateVirtualURLToURL(existing_entry, params.url);
+diff --git a/content/browser/frame_host/navigation_controller_impl_unittest.cc b/content/browser/frame_host/navigation_controller_impl_unittest.cc
+--- a/content/browser/frame_host/navigation_controller_impl_unittest.cc
++++ b/content/browser/frame_host/navigation_controller_impl_unittest.cc
+@@ -28,6 +28,7 @@
+ #include "content/public/browser/web_contents_observer.h"
+ #include "content/public/common/content_switches.h"
+ #include "content/public/common/page_state.h"
++#include "content/public/common/page_type.h"
+ #include "content/public/common/url_constants.h"
+ #include "content/public/test/mock_render_process_host.h"
+ #include "content/public/test/test_notification_tracker.h"
+@@ -4456,4 +4457,61 @@
+   EXPECT_EQ(0, delegate->repost_form_warning_count());
+ }
+ 
++TEST_F(NavigationControllerTest, UnreachableURLGivesErrorPage) {
++  GURL url("http://foo");
++  FrameHostMsg_DidCommitProvisionalLoad_Params params;
++  params.page_id = 1;
++  params.url = url;
++  params.transition = ui::PAGE_TRANSITION_LINK;
++  params.gesture = NavigationGestureUser;
++  params.page_state = PageState::CreateFromURL(url);
++  params.was_within_same_page = false;
++  params.is_post = true;
++  params.post_id = 2;
++  params.url_is_unreachable = true;
++  // Navigate to new page
++  {
++    LoadCommittedDetails details;
++    controller_impl().RendererDidNavigate(main_test_rfh(), params, &details);
++    EXPECT_EQ(PAGE_TYPE_ERROR,
++              controller_impl().GetLastCommittedEntry()->GetPageType());
++    EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, details.type);
++  }
++
++  // Navigate to existing page.
++  {
++    LoadCommittedDetails details;
++    controller_impl().RendererDidNavigate(main_test_rfh(), params, &details);
++    EXPECT_EQ(PAGE_TYPE_ERROR,
++              controller_impl().GetLastCommittedEntry()->GetPageType());
++    EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, details.type);
++  }
++
++  // Navigate to same page.
++  // Note: The call to LoadURL() creates a pending entry in order to trigger the
++  // same-page transition.
++  controller_impl().LoadURL(
++      url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
++  params.transition = ui::PAGE_TRANSITION_TYPED;
++  {
++    LoadCommittedDetails details;
++    controller_impl().RendererDidNavigate(main_test_rfh(), params, &details);
++    EXPECT_EQ(PAGE_TYPE_ERROR,
++              controller_impl().GetLastCommittedEntry()->GetPageType());
++    EXPECT_EQ(NAVIGATION_TYPE_SAME_PAGE, details.type);
++  }
++
++  // Navigate in page.
++  params.url = GURL("http://foo#foo");
++  params.transition = ui::PAGE_TRANSITION_LINK;
++  params.was_within_same_page = true;
++  {
++    LoadCommittedDetails details;
++    controller_impl().RendererDidNavigate(main_test_rfh(), params, &details);
++    EXPECT_EQ(PAGE_TYPE_ERROR,
++              controller_impl().GetLastCommittedEntry()->GetPageType());
++    EXPECT_EQ(NAVIGATION_TYPE_IN_PAGE, details.type);
++  }
++}
++
+ }  // namespace content

=== modified file 'patches/port/gl_implementation.patch'
--- patches/port/gl_implementation.patch	2015-03-26 09:58:06 +0000
+++ patches/port/gl_implementation.patch	2015-04-10 12:47:19 +0000
@@ -102,11 +102,28 @@
          'gl_context_stub.h',
          'gl_context_stub_with_extensions.cc',
          'gl_context_stub_with_extensions.h',
+<<<<<<< TREE
          'gl_context_win.cc',
          'gl_context_x11.cc',
          'gl_enums.cc',
          'gl_enums.h',
 @@ -81,32 +82,32 @@
+=======
+-        'gl_context_win.cc',
+-        'gl_context_x11.cc',
++        #'gl_context_win.cc',
++        #'gl_context_x11.cc',
+         'gl_export.h',
+         'gl_fence.cc',
+         'gl_fence.h',
+         'gl_fence_arb.cc',
+         'gl_fence_arb.h',
+         'gl_fence_nv.cc',
+         'gl_fence_nv.h',
+         'gl_gl_api_implementation.cc',
+@@ -81,52 +82,57 @@
+         'gl_image_ref_counted_memory.h',
+>>>>>>> MERGE-SOURCE
          'gl_image_shared_memory.cc',
          'gl_image_shared_memory.h',
          'gl_image_stub.cc',
@@ -150,10 +167,16 @@
          'scoped_make_current.h',
          'sync_control_vsync_provider.cc',
          'sync_control_vsync_provider.h',
+<<<<<<< TREE
+=======
+         '<(gl_binding_output_dir)/gl_bindings_autogen_osmesa.cc',
+         '<(gl_binding_output_dir)/gl_bindings_autogen_osmesa.h',
+>>>>>>> MERGE-SOURCE
 +        '<(DEPTH)/../../../shared/port/gl/gl_context_oxide_linux.cc',
 +        '<(DEPTH)/../../../shared/port/gl/gl_implementation_oxide_linux.cc',
 +        '<(DEPTH)/../../../shared/port/gl/gl_surface_oxide_linux.cc',
        ],
+<<<<<<< TREE
        'conditions': [
          ['OS in ("win", "android", "linux")', {
            'sources': [
@@ -162,6 +185,16 @@
              'gl_bindings_autogen_egl.cc',
              'gl_bindings_autogen_egl.h',
 @@ -151,28 +155,28 @@
+=======
+       # hard_dependency is necessary for this target because it has actions
+       # that generate header files included by dependent targets. The header
+       # files must be generated before the dependents are compiled. The usual
+       # semantics are to allow the two targets to build concurrently.
+       'hard_dependency': 1,
+       'actions': [
+         {
+@@ -215,24 +221,24 @@
+>>>>>>> MERGE-SOURCE
            ],
          }],
          ['OS=="linux"', {
@@ -256,7 +289,11 @@
  #undef Bool
  #undef None
  #undef Status
+<<<<<<< TREE
 @@ -314,16 +314,19 @@ typedef uint64 EGLuint64CHROMIUM;
+=======
+@@ -316,16 +316,19 @@ typedef uint64 EGLuint64CHROMIUM;
+>>>>>>> MERGE-SOURCE
  #if defined(OS_WIN)
  #include "gl_bindings_autogen_egl.h"
  #include "gl_bindings_autogen_wgl.h"
@@ -269,14 +306,21 @@
 +#include "gl_bindings_autogen_glx.h"
 +#endif
  #elif defined(OS_ANDROID)
- #include "gl_bindings_autogen_egl.h"
+ #include "gl_bindings_autogen_egl_android.h"
  #endif
  
  namespace gfx {
  
  struct GL_EXPORT DriverGL {
    void InitializeStaticBindings();
+<<<<<<< TREE
 @@ -383,17 +386,17 @@ struct GL_EXPORT DriverEGL {
+=======
+@@ -379,17 +382,17 @@ struct GL_EXPORT DriverEGL {
+   void ClearBindings();
+ 
+   ProcsEGL fn;
+>>>>>>> MERGE-SOURCE
    ProcsEGL debug_fn;
    ExtensionsEGL ext;
  
@@ -294,8 +338,12 @@
  
    ProcsGLX fn;
    ProcsGLX debug_fn;
+<<<<<<< TREE
    ExtensionsGLX ext;
 @@ -425,16 +428,23 @@ GL_EXPORT extern GLXApi* g_current_glx_c
+=======
+@@ -419,16 +422,23 @@ GL_EXPORT extern GLXApi* g_current_glx_c
+>>>>>>> MERGE-SOURCE
  GL_EXPORT extern DriverEGL g_driver_egl;
  GL_EXPORT extern DriverGLX g_driver_glx;
  

=== modified file 'patches/series'
--- patches/series	2015-04-07 14:20:35 +0000
+++ patches/series	2015-04-10 12:47:19 +0000
@@ -27,9 +27,16 @@
 customize-gesture-fling-curve.patch
 mediahub-support.patch
 allow-os-override-for-gpu-manager.patch
+<<<<<<< TREE
 use-android-style-overlay-scrollbars.patch
 allow-render-widget-compositor-settings-override.patch
 enable-accelerated-canvas-on-krillin.patch
 pulse-audio-role.patch
 enable-accelerated-canvas-on-arale.patch
 fix-crbug-473891.patch
+=======
+viewport-min-width.patch
+use-android-style-overlay-scrollbars.patch
+allow-render-widget-compositor-settings-override.patch
+bug1423531.patch
+>>>>>>> MERGE-SOURCE

=== modified file 'patches/support-native-popup-menus.patch'
--- patches/support-native-popup-menus.patch	2015-04-06 21:26:49 +0000
+++ patches/support-native-popup-menus.patch	2015-04-10 12:47:19 +0000
@@ -26,6 +26,7 @@
  
  void RenderFrameHostImpl::AccessibilitySetFocus(int object_id) {
    Send(new AccessibilityMsg_SetFocus(routing_id_, object_id));
+<<<<<<< TREE
 @@ -1398,17 +1396,16 @@ void RenderFrameHostImpl::OnToggleFullsc
    else
      delegate_->ExitFullscreenMode();
@@ -33,6 +34,15 @@
    // The previous call might change the fullscreen state. We need to make sure
    // the renderer is aware of that, which is done via the resize message.
    render_view_host_->WasResized();
+=======
+@@ -1154,17 +1152,16 @@ void RenderFrameHostImpl::OnAccessibilit
+     if (manager) {
+       manager->OnFindInPageResult(
+           params.request_id, params.match_index, params.start_id,
+           params.start_offset, params.end_id, params.end_offset);
+     }
+   }
+>>>>>>> MERGE-SOURCE
  }
  
 -#if defined(OS_MACOSX) || defined(OS_ANDROID)
@@ -44,7 +54,11 @@
      view->ShowPopupMenu(this,
                          params.bounds,
                          params.item_height,
+<<<<<<< TREE
 @@ -1421,17 +1418,16 @@ void RenderFrameHostImpl::OnShowPopup(
+=======
+@@ -1177,17 +1174,16 @@ void RenderFrameHostImpl::OnShowPopup(
+>>>>>>> MERGE-SOURCE
  }
  
  void RenderFrameHostImpl::OnHidePopup() {
@@ -55,6 +69,7 @@
  }
 -#endif
  
+<<<<<<< TREE
  #if defined(ENABLE_MEDIA_MOJO_RENDERER)
  static void CreateMediaRendererService(
      mojo::InterfaceRequest<mojo::MediaRenderer> request) {
@@ -63,6 +78,16 @@
  }
  #endif
 @@ -1876,29 +1872,28 @@ RenderFrameHostImpl::GetParentNativeView
+=======
+ void RenderFrameHostImpl::RegisterMojoServices() {
+   GeolocationServiceContext* geolocation_service_context =
+       delegate_ ? delegate_->GetGeolocationServiceContext() : NULL;
+   if (geolocation_service_context) {
+     // TODO(creis): Bind process ID here so that GeolocationServiceImpl
+     // can perform permissions checks once site isolation is complete.
+     // crbug.com/426384
+@@ -1573,29 +1569,28 @@ RenderFrameHostImpl::GetParentNativeView
+>>>>>>> MERGE-SOURCE
  void RenderFrameHostImpl::DidSelectPopupMenuItem(int selected_index) {
    Send(new FrameMsg_SelectPopupMenuItem(routing_id_, selected_index));
  }
@@ -116,7 +141,11 @@
  
  namespace content {
  
+<<<<<<< TREE
 @@ -398,20 +396,19 @@ class CONTENT_EXPORT RenderFrameHostImpl
+=======
+@@ -365,20 +363,19 @@ class CONTENT_EXPORT RenderFrameHostImpl
+>>>>>>> MERGE-SOURCE
  #if defined(OS_WIN)
    void SetParentNativeViewAccessible(
        gfx::NativeViewAccessible accessible_parent);
@@ -138,7 +167,12 @@
                          const CommonNavigationParams& common_params,
                          const RequestNavigationParams& request_params);
  
+<<<<<<< TREE
 @@ -508,20 +505,18 @@ class CONTENT_EXPORT RenderFrameHostImpl
+=======
+@@ -461,20 +458,18 @@ class CONTENT_EXPORT RenderFrameHostImpl
+   void OnAccessibilityEvents(
+>>>>>>> MERGE-SOURCE
        const std::vector<AccessibilityHostMsg_EventParams>& params,
        int reset_token);
    void OnAccessibilityLocationChanges(
@@ -198,6 +232,7 @@
 diff --git a/content/common/frame_messages.h b/content/common/frame_messages.h
 --- a/content/common/frame_messages.h
 +++ b/content/common/frame_messages.h
+<<<<<<< TREE
 @@ -293,17 +293,16 @@ IPC_STRUCT_BEGIN(FrameMsg_TextTrackSetti
  
    // Text shadow (edge style) of the text track text.
@@ -205,6 +240,15 @@
  
    // Size of the text track text.
    IPC_STRUCT_MEMBER(std::string, text_track_text_size)
+=======
+@@ -321,17 +321,16 @@ IPC_STRUCT_BEGIN(FrameHostMsg_BeginNavig
+   // Optional resource request body (may be null).
+   IPC_STRUCT_MEMBER(scoped_refptr<content::ResourceRequestBody>,
+                     request_body)
+ 
+   // True if the request was user initiated.
+   IPC_STRUCT_MEMBER(bool, has_user_gesture)
+>>>>>>> MERGE-SOURCE
  IPC_STRUCT_END()
  
 -#if defined(OS_MACOSX) || defined(OS_ANDROID)
@@ -216,7 +260,11 @@
  
    // The height of each item in the menu.
    IPC_STRUCT_MEMBER(int, item_height)
+<<<<<<< TREE
 @@ -318,17 +317,16 @@ IPC_STRUCT_BEGIN(FrameHostMsg_ShowPopup_
+=======
+@@ -346,17 +345,16 @@ IPC_STRUCT_BEGIN(FrameHostMsg_ShowPopup_
+>>>>>>> MERGE-SOURCE
    IPC_STRUCT_MEMBER(std::vector<content::MenuItem>, popup_items)
  
    // Whether items should be right-aligned.
@@ -234,9 +282,16 @@
  // presented. When the frame finishes presenting, a matching
  // FrameHostMsg_CompositorFrameSwappedACK should be sent back to the
  // RenderViewHost that was produced the CompositorFrame.
+<<<<<<< TREE
 @@ -503,24 +501,22 @@ IPC_MESSAGE_ROUTED1(FrameMsg_DidUpdateSa
  // changed in another process.
  IPC_MESSAGE_ROUTED1(FrameMsg_DidUpdateName, std::string /* name */)
+=======
+@@ -505,24 +503,22 @@ IPC_MESSAGE_ROUTED1(FrameMsg_TextSurroun
+ // Tells the renderer to insert a link to the specified stylesheet. This is
+ // needed to support navigation transitions.
+ IPC_MESSAGE_ROUTED1(FrameMsg_AddStyleSheetByURL, std::string)
+>>>>>>> MERGE-SOURCE
  
  // Send to the RenderFrame to set text track style settings.
  // Sent for top-level frames.
@@ -260,10 +315,17 @@
  #endif
  
  // PlzNavigate
+<<<<<<< TREE
 @@ -848,16 +844,12 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_VisualS
  // Puts the browser into "tab fullscreen" mode for the sending renderer.
  // See the comment in chrome/browser/ui/browser.h for more details.
  IPC_MESSAGE_ROUTED1(FrameHostMsg_ToggleFullscreen, bool /* enter_fullscreen */)
+=======
+@@ -827,16 +823,12 @@ IPC_MESSAGE_CONTROL1(FrameHostMsg_AddNav
+ IPC_MESSAGE_ROUTED2(FrameHostMsg_BeginNavigation,
+                     FrameHostMsg_BeginNavigation_Params,
+                     content::CommonNavigationParams)
+>>>>>>> MERGE-SOURCE
  
  // Dispatch a load event for this frame in the iframe element of an
  // out-of-process parent frame.
@@ -375,7 +437,11 @@
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
+<<<<<<< TREE
 @@ -958,23 +958,21 @@ bool RenderFrameImpl::Send(IPC::Message*
+=======
+@@ -891,23 +891,21 @@ bool RenderFrameImpl::Send(IPC::Message*
+>>>>>>> MERGE-SOURCE
        delete message;
        return false;
      }
@@ -399,7 +465,13 @@
      return false;
  
    // TODO(kenrb): document() should not be null, but as a transitional step
+<<<<<<< TREE
 @@ -1044,19 +1042,18 @@ bool RenderFrameImpl::OnMessageReceived(
+=======
+@@ -973,19 +971,18 @@ bool RenderFrameImpl::OnMessageReceived(
+                         OnTextSurroundingSelectionRequest)
+     IPC_MESSAGE_HANDLER(FrameMsg_AddStyleSheetByURL,
+>>>>>>> MERGE-SOURCE
                          OnAddStyleSheetByURL)
      IPC_MESSAGE_HANDLER(FrameMsg_SetAccessibilityMode,
                          OnSetAccessibilityMode)
@@ -420,6 +492,7 @@
    return handled;
  }
  
+<<<<<<< TREE
 @@ -1597,31 +1594,29 @@ void RenderFrameImpl::OnTextTrackSetting
    render_view_->webview()->settings()->setTextTrackTextColor(
        WebString::fromUTF8(params.text_track_text_color));
@@ -427,6 +500,15 @@
        WebString::fromUTF8(params.text_track_text_shadow));
    render_view_->webview()->settings()->setTextTrackTextSize(
        WebString::fromUTF8(params.text_track_text_size));
+=======
+@@ -1478,31 +1475,29 @@ void RenderFrameImpl::OnDisownOpener() {
+   // disowning the opener on subframes, we will need to move WebContentsImpl's
+   // opener_ to FrameTreeNode.
+   CHECK(!frame_->parent());
+ 
+   if (frame_->opener())
+     frame_->setOpener(NULL);
+>>>>>>> MERGE-SOURCE
  }
  
 -#if defined(OS_ANDROID)
@@ -452,7 +534,11 @@
    external_popup_menu_->DidSelectItem(selected_index);
    external_popup_menu_.reset();
  }
+<<<<<<< TREE
 @@ -2003,17 +1998,17 @@ RenderFrameImpl::createWorkerContentSett
+=======
+@@ -1909,17 +1904,17 @@ RenderFrameImpl::createWorkerPermissionC
+>>>>>>> MERGE-SOURCE
    DCHECK(!frame_ || frame_ == frame);
    return GetContentClient()->renderer()->CreateWorkerContentSettingsClientProxy(
        this, frame);
@@ -513,10 +599,16 @@
  #endif
  
    void OnCommitNavigation(const ResourceResponseHead& response,
+<<<<<<< TREE
                            const GURL& stream_url,
                            const CommonNavigationParams& common_params,
                            const RequestNavigationParams& request_params);
 @@ -910,20 +907,18 @@ class CONTENT_EXPORT RenderFrameImpl
+=======
+@@ -828,20 +825,18 @@ class CONTENT_EXPORT RenderFrameImpl
+ 
+   // The current accessibility mode.
+>>>>>>> MERGE-SOURCE
    AccessibilityMode accessibility_mode_;
  
    // Only valid if |accessibility_mode_| is anything other than
@@ -540,7 +632,11 @@
 diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
 --- a/content/renderer/render_thread_impl.cc
 +++ b/content/renderer/render_thread_impl.cc
+<<<<<<< TREE
 @@ -465,20 +465,18 @@ RenderThreadImpl::RenderThreadImpl(
+=======
+@@ -437,20 +437,18 @@ RenderThreadImpl::RenderThreadImpl(
+>>>>>>> MERGE-SOURCE
  
  void RenderThreadImpl::Init() {
    TRACE_EVENT_BEGIN_ETW("RenderThreadImpl::Init", 0, "");
@@ -564,8 +660,12 @@
 diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
 --- a/content/renderer/render_widget.cc
 +++ b/content/renderer/render_widget.cc
+<<<<<<< TREE
 @@ -678,23 +678,21 @@ gfx::Rect RenderWidget::AdjustValidation
  
+=======
+@@ -650,23 +650,21 @@ gfx::Rect RenderWidget::AdjustValidation
+>>>>>>> MERGE-SOURCE
  void RenderWidget::SetScreenMetricsEmulationParameters(
      bool enabled,
      const blink::WebDeviceEmulationParams& params) {
@@ -591,10 +691,14 @@
 diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h
 --- a/content/renderer/render_widget.h
 +++ b/content/renderer/render_widget.h
+<<<<<<< TREE
 @@ -390,20 +390,18 @@ class CONTENT_EXPORT RenderWidget
                const gfx::Rect& resizer_rect,
                bool is_fullscreen,
                ResizeAck resize_ack);
+=======
+@@ -378,20 +378,18 @@ class CONTENT_EXPORT RenderWidget
+>>>>>>> MERGE-SOURCE
    // Used to force the size of a window when running layout tests.
    void SetWindowRectSynchronously(const gfx::Rect& new_window_rect);
    virtual void SetScreenMetricsEmulationParameters(

=== modified file 'patches/use-android-style-overlay-scrollbars.patch'
--- patches/use-android-style-overlay-scrollbars.patch	2015-03-25 21:56:29 +0000
+++ patches/use-android-style-overlay-scrollbars.patch	2015-04-10 12:47:19 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 # Description: Use Android-style overlay and pinch-viewport scrollbars, and
 #  disable scrollbars for the main frame when pinch-viewport is enabled (the
 #  pinch-viewport scrollbars will be used there). This makes an assumption
@@ -104,3 +105,78 @@
  }
  
  int ScrollbarThemeAura::scrollbarThickness(ScrollbarControlSize controlSize)
+=======
+# Description: Use Android-style overlay and pinch-viewport scrollbars, and
+#  disable scrollbars for the main frame when pinch-viewport is enabled (the
+#  pinch-viewport scrollbars will be used there). This makes an assumption
+#  that overlay scrollbars and pinch-viewport are mobile-only. If we want to
+#  support these on desktop in the future, then we'll need to rethink this
+# Author: Chris Coulson <[e-mail]>
+
+diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp
+--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
++++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
+@@ -3017,17 +3017,17 @@ bool FrameView::scrollbarsDisabled() con
+ {
+     if (!m_frame->settings() || !m_frame->settings()->pinchVirtualViewportEnabled())
+         return false;
+ 
+     // FIXME: This decision should be made based on whether or not to use
+     // viewport scrollbars for the main frame. This is implicitly just Android,
+     // but should be made explicit.
+     // http://crbug.com/434533
+-#if !OS(ANDROID)
++#if 0
+     return false;
+ #else
+     return m_frame->isMainFrame();
+ #endif
+ }
+ 
+ AXObjectCache* FrameView::axObjectCache() const
+ {
+diff --git a/third_party/WebKit/Source/core/frame/PinchViewport.cpp b/third_party/WebKit/Source/core/frame/PinchViewport.cpp
+--- a/third_party/WebKit/Source/core/frame/PinchViewport.cpp
++++ b/third_party/WebKit/Source/core/frame/PinchViewport.cpp
+@@ -341,17 +341,17 @@ void PinchViewport::setupScrollbar(WebSc
+         m_webOverlayScrollbarHorizontal : m_webOverlayScrollbarVertical;
+ 
+     int thumbThickness = frameHost().settings().pinchOverlayScrollbarThickness();
+     int scrollbarThickness = thumbThickness;
+     int scrollbarMargin = scrollbarThickness;
+ 
+     // FIXME: Rather than manually creating scrollbar layers, we should create
+     // real scrollbars so we can reuse all the machinery from ScrollbarTheme.
+-#if OS(ANDROID)
++#if 1
+     thumbThickness = ScrollbarTheme::theme()->thumbThickness(0);
+     scrollbarThickness = ScrollbarTheme::theme()->scrollbarThickness(RegularScrollbar);
+     scrollbarMargin = ScrollbarTheme::theme()->scrollbarMargin();
+ #endif
+ 
+     if (!webScrollbarLayer) {
+         ScrollingCoordinator* coordinator = frameHost().page().scrollingCoordinator();
+         ASSERT(coordinator);
+diff --git a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeAura.cpp b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeAura.cpp
+--- a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeAura.cpp
++++ b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeAura.cpp
+@@ -46,17 +46,17 @@ namespace blink {
+ static bool useMockTheme()
+ {
+     return LayoutTestSupport::isRunningLayoutTest();
+ }
+ 
+ ScrollbarTheme* ScrollbarTheme::nativeTheme()
+ {
+     if (RuntimeEnabledFeatures::overlayScrollbarsEnabled()) {
+-        DEFINE_STATIC_LOCAL(ScrollbarThemeOverlay, theme, (10, 0, ScrollbarThemeOverlay::AllowHitTest));
++        DEFINE_STATIC_LOCAL(ScrollbarThemeOverlay, theme, (3, 3, ScrollbarThemeOverlay::DisallowHitTest, Color(128, 128, 128, 128)));
+         return &theme;
+     }
+ 
+     DEFINE_STATIC_LOCAL(ScrollbarThemeAura, theme, ());
+     return &theme;
+ }
+ 
+ int ScrollbarThemeAura::scrollbarThickness(ScrollbarControlSize controlSize)
+>>>>>>> MERGE-SOURCE

=== modified file 'qt/CMakeLists.txt'
=== modified file 'qt/VERSION'
--- qt/VERSION	2015-02-23 23:37:56 +0000
+++ qt/VERSION	2015-04-10 12:47:19 +0000
@@ -1,3 +1,7 @@
 MAJOR=1
+<<<<<<< TREE
 MINOR=7
 PATCH=0
+=======
+MINOR=5
+PATCH=7>>>>>>> MERGE-SOURCE

=== modified file 'qt/core/browser/oxide_qt_browser_startup.cc'
--- qt/core/browser/oxide_qt_browser_startup.cc	2015-04-03 17:31:03 +0000
+++ qt/core/browser/oxide_qt_browser_startup.cc	2015-04-10 12:47:19 +0000
@@ -115,8 +115,13 @@
   process_model_ = model;
 }
 
+<<<<<<< TREE
 #if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
 void BrowserStartup::SetSharedGLContext(GLContextDependent* context) {
+=======
+#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
+void BrowserStartup::SetSharedGLContext(GLContextAdopted* context) {
+>>>>>>> MERGE-SOURCE
   DCHECK(!oxide::BrowserProcessMain::GetInstance()->IsRunning());
   shared_gl_context_ = context;
 }
@@ -150,6 +155,7 @@
     gl_impl = shared_gl_context_->implementation();
   } else {
     QString platform = QGuiApplication::platformName();
+<<<<<<< TREE
     if (QGuiApplication::platformNativeInterface()) {
       if (platform == QLatin1String("xcb")) {
         gl_impl = gfx::kGLImplementationDesktopGL;
@@ -160,6 +166,13 @@
             << "Cannot determine GL implementation to use - "
             << "unrecognized Qt platform: " << qPrintable(platform);
       }
+=======
+    if (platform == QLatin1String("xcb")) {
+      supported_gl_impls |= oxide::SUPPORTED_GL_IMPL_DESKTOP_GL;
+      supported_gl_impls |= oxide::SUPPORTED_GL_IMPL_EGL_GLES2;
+    } else if (platform.startsWith("ubuntu") || platform == QLatin1String("mirserver")) {
+      supported_gl_impls |= oxide::SUPPORTED_GL_IMPL_EGL_GLES2;
+>>>>>>> MERGE-SOURCE
     } else {
       LOG(WARNING)
           << "Unable to use GL - No QPlatformNativeInterface for "

=== modified file 'qt/core/browser/oxide_qt_browser_startup.h'
--- qt/core/browser/oxide_qt_browser_startup.h	2015-03-24 17:06:40 +0000
+++ qt/core/browser/oxide_qt_browser_startup.h	2015-04-10 12:47:19 +0000
@@ -44,11 +44,16 @@
   oxide::ProcessModel GetProcessModel();
   void SetProcessModel(oxide::ProcessModel model);
 
+<<<<<<< TREE
   GLContextDependent* shared_gl_context() const {
     return shared_gl_context_.get();
   }
 #if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
   void SetSharedGLContext(GLContextDependent* context);
+=======
+#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
+  void SetSharedGLContext(GLContextAdopted* context);
+>>>>>>> MERGE-SOURCE
 #endif
 
   bool DidSelectProcessModelFromEnv() const;

=== modified file 'qt/core/glue/oxide_qt_init.cc'
--- qt/core/glue/oxide_qt_init.cc	2015-04-02 12:13:31 +0000
+++ qt/core/glue/oxide_qt_init.cc	2015-04-10 12:47:19 +0000
@@ -18,8 +18,13 @@
 #include "oxide_qt_init.h"
 
 #include "qt/core/browser/oxide_qt_browser_startup.h"
+<<<<<<< TREE
 #if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
 #include "qt/core/gpu/oxide_qt_gl_context_dependent.h"
+=======
+#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
+#include "qt/core/gpu/oxide_qt_gl_context_adopted.h"
+>>>>>>> MERGE-SOURCE
 #endif
 
 namespace oxide {

=== modified file 'qt/quick/CMakeLists.txt'
--- qt/quick/CMakeLists.txt	2015-04-09 16:41:51 +0000
+++ qt/quick/CMakeLists.txt	2015-04-10 12:47:19 +0000
@@ -35,12 +35,20 @@
     api/oxideqquickwebframe.cc
     api/oxideqquickwebview.cc
     api/oxidequseragentoverriderequest.cc
+<<<<<<< TREE
     oxide_qquick_accelerated_frame_node.cc
     oxide_qquick_alert_dialog.cc
     oxide_qquick_before_unload_dialog.cc
     oxide_qquick_confirm_dialog.cc
     oxide_qquick_file_picker.cc
     oxide_qquick_image_frame_node.cc
+=======
+    oxide_qquick_accelerated_frame_node.cc
+    oxide_qquick_alert_dialog_delegate.cc
+    oxide_qquick_before_unload_dialog_delegate.cc
+    oxide_qquick_confirm_dialog_delegate.cc
+    oxide_qquick_file_picker_delegate.cc
+>>>>>>> MERGE-SOURCE
     oxide_qquick_init.cc
     oxide_qquick_javascript_dialog.cc
     oxide_qquick_prompt_dialog.cc

=== modified file 'qt/quick/api/oxideqquickwebframe.cc'
--- qt/quick/api/oxideqquickwebframe.cc	2015-04-07 17:42:38 +0000
+++ qt/quick/api/oxideqquickwebframe.cc	2015-04-10 12:47:19 +0000
@@ -211,6 +211,7 @@
   OxideQQuickScriptMessageRequest* request =
       new OxideQQuickScriptMessageRequest();
 
+<<<<<<< TREE
   QVariant aux = args;
   if (aux.userType() == qMetaTypeId<QJSValue>()) {
     aux = aux.value<QJSValue>().toVariant();
@@ -219,6 +220,15 @@
   if (!d->proxy()->sendMessage(
           context, msg_id, aux,
           OxideQQuickScriptMessageRequestPrivate::get(request))) {
+=======
+  QVariant aux = args;
+  if (aux.userType() == qMetaTypeId<QJSValue>()) {
+    aux = aux.value<QJSValue>().toVariant();
+  }
+
+  if (!d->sendMessage(context, msg_id, aux,
+                      OxideQQuickScriptMessageRequestPrivate::get(request))) {
+>>>>>>> MERGE-SOURCE
     delete request;
     return nullptr;
   }
@@ -231,10 +241,19 @@
                                              const QVariant& args) {
   Q_D(OxideQQuickWebFrame);
 
+<<<<<<< TREE
   QVariant aux = args;
   if (aux.userType() == qMetaTypeId<QJSValue>()) {
     aux = aux.value<QJSValue>().toVariant();
   }
 
   d->proxy()->sendMessageNoReply(context, msg_id, aux);
+=======
+  QVariant aux = args;
+  if (aux.userType() == qMetaTypeId<QJSValue>()) {
+    aux = aux.value<QJSValue>().toVariant();
+  }
+
+  d->sendMessageNoReply(context, msg_id, aux);
+>>>>>>> MERGE-SOURCE
 }

=== modified file 'qt/quick/api/oxideqquickwebview.cc'
--- qt/quick/api/oxideqquickwebview.cc	2015-04-09 16:41:51 +0000
+++ qt/quick/api/oxideqquickwebview.cc	2015-04-10 12:47:19 +0000
@@ -46,11 +46,18 @@
 #include "qt/core/api/oxideqnewviewrequest.h"
 #include "qt/core/api/oxideqpermissionrequest.h"
 #include "qt/quick/oxide_qquick_accelerated_frame_node.h"
+<<<<<<< TREE
 #include "qt/quick/oxide_qquick_alert_dialog.h"
 #include "qt/quick/oxide_qquick_before_unload_dialog.h"
 #include "qt/quick/oxide_qquick_confirm_dialog.h"
 #include "qt/quick/oxide_qquick_file_picker.h"
 #include "qt/quick/oxide_qquick_image_frame_node.h"
+=======
+#include "qt/quick/oxide_qquick_alert_dialog_delegate.h"
+#include "qt/quick/oxide_qquick_before_unload_dialog_delegate.h"
+#include "qt/quick/oxide_qquick_confirm_dialog_delegate.h"
+#include "qt/quick/oxide_qquick_file_picker_delegate.h"
+>>>>>>> MERGE-SOURCE
 #include "qt/quick/oxide_qquick_init.h"
 #include "qt/quick/oxide_qquick_prompt_dialog.h"
 #include "qt/quick/oxide_qquick_software_frame_node.h"
@@ -990,6 +997,7 @@
 
     return node;
   }
+<<<<<<< TREE
 
   if (handle->GetType() ==
       oxide::qt::CompositorFrameHandle::TYPE_IMAGE) {
@@ -1004,6 +1012,8 @@
 
     return node;
   }
+=======
+>>>>>>> MERGE-SOURCE
 
   if (handle->GetType() ==
       oxide::qt::CompositorFrameHandle::TYPE_SOFTWARE) {

=== modified file 'qt/renderer/renderer.gyp'
--- qt/renderer/renderer.gyp	2015-02-19 22:53:17 +0000
+++ qt/renderer/renderer.gyp	2015-04-10 12:47:19 +0000
@@ -36,7 +36,12 @@
         ['enable_tcmalloc==1', {
           'defines': ['ENABLE_TCMALLOC'],
           'dependencies': [
-            '../../shared/allocator.gyp:allocator',
+<<<<<<< TREE
+            '../../shared/allocator.gyp:allocator',
+=======
+            '<(DEPTH)/base/base.gyp:base',
+            '../../shared/allocator.gyp:allocator',
+>>>>>>> MERGE-SOURCE
           ],
         }],
         ['component=="shared_library"', {

=== modified file 'qt/tests/qmltests/api/tst_WebView_loading.qml'
=== modified file 'shared/browser/compositor/oxide_compositor_utils.cc'
--- shared/browser/compositor/oxide_compositor_utils.cc	2015-03-24 17:06:40 +0000
+++ shared/browser/compositor/oxide_compositor_utils.cc	2015-04-10 12:47:19 +0000
@@ -78,11 +78,45 @@
       : command_buffer_id_(client_id, route_id),
         mailbox_(mailbox),
         sync_point_(sync_point),
+<<<<<<< TREE
         task_runner_(task_runner) {}
+=======
+        callback_(callback),
+        task_runner_(task_runner),
+        gpu_thread_checker_(gpu_thread_checker),
+        response_posted_(false) {
+    DCHECK(task_runner_.get());
+    DCHECK(!callback_.is_null());
+    DCHECK(context_provider_.get());
+
+    route_id_ = content::oxide_gpu_shim::GetContextProviderRouteID(
+        static_cast<content::ContextProviderCommandBuffer*>(
+          context_provider_.get()));
+  }
+
+  virtual ~FetchTextureResourcesTask() {
+    if (response_posted_ && context_provider_) {
+      // XXX: This is a bit of a hack - basically if we arrive here, it means
+      //  that the task posted to the main thread never ran and we're now
+      //  being destroyed as part of the main loop teardown.
+      //  As cc::ContextProvider owns lots of classes with non-trivial
+      //  destructors, we deliberately leak it here in order to avoid shut-
+      //  down crashes. This is a workaround for the 1.5 branch. The full fix
+      //  is http://bazaar.launchpad.net/~oxide-developers/oxide/oxide.trunk/revision/1003
+      LOG(ERROR) <<
+          "Leaking cc::ContextProvider to avoid a shutdown crash. You should only see "
+          "this message during application shutdown";
+      context_provider_->AddRef();
+    }
+  }
+
+  void FetchTextureResourcesOnGpuThread();
+>>>>>>> MERGE-SOURCE
 
  private:
   CommandBufferID command_buffer_id_;
   gpu::Mailbox mailbox_;
+<<<<<<< TREE
   uint32_t sync_point_;
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 };
@@ -137,6 +171,14 @@
  private:
   CompositorUtils::CreateEGLImageFromMailboxCallback callback_;
   EGLImageKHR egl_image_;
+=======
+  uint32 sync_point_;
+  CompositorUtils::CreateGLFrameHandleCallback callback_;
+  scoped_refptr<base::TaskRunner> task_runner_;
+  base::ThreadChecker gpu_thread_checker_;
+
+  bool response_posted_;
+>>>>>>> MERGE-SOURCE
 };
 
 class CompositorThread : public base::Thread {
@@ -245,6 +287,7 @@
   DISALLOW_COPY_AND_ASSIGN(CompositorUtilsImpl);
 };
 
+<<<<<<< TREE
 FetchTextureResourcesTaskInfo::~FetchTextureResourcesTaskInfo() {
   DCHECK(CompositorUtilsImpl::GetInstance()->CalledOnMainOrCompositorThread());
 }
@@ -281,6 +324,70 @@
   DCHECK(task_runner()->RunsTasksOnCurrentThread());
   callback_.Run(egl_image_);
   egl_image_ = EGL_NO_IMAGE_KHR;
+=======
+GLFrameHandle::~GLFrameHandle() {
+  content::GpuChildThread::GetTaskRunner()->PostTask(
+      FROM_HERE,
+      base::Bind(&CompositorUtilsImpl::RemoveTextureRef,
+                 base::Unretained(CompositorUtilsImpl::GetInstance()),
+                 mailbox()));
+}
+
+void FetchTextureResourcesTask::OnSyncPointRetired() {
+  DCHECK(gpu_thread_checker_.CalledOnValidThread());
+
+  GLuint service_id = 0;
+  TextureRefHolder ref =
+      content::oxide_gpu_shim::CreateTextureRef(client_id_,
+                                                route_id_,
+                                                mailbox_);
+  if (ref.IsValid() &&
+      CompositorUtilsImpl::GetInstance()->AddTextureRef(mailbox_, ref)) {
+    service_id = ref.GetServiceID();
+  }
+
+  response_posted_ = true;
+
+  task_runner_->PostTask(
+      FROM_HERE,
+      base::Bind(&FetchTextureResourcesTask::SendResponseOnDestinationThread,
+                 this, service_id));
+}
+
+void FetchTextureResourcesTask::SendResponseOnDestinationThread(
+    GLuint service_id) {
+  DCHECK(task_runner_->RunsTasksOnCurrentThread());
+
+  if (service_id == 0) {
+    callback_.Run(scoped_ptr<GLFrameData>());
+    return;
+  }
+
+  scoped_ptr<GLFrameHandle> handle(
+      new GLFrameHandle(mailbox_,
+                        service_id,
+                        context_provider_));
+  callback_.Run(handle.Pass());
+
+  callback_.Reset();
+  context_provider_ = nullptr;
+}
+
+void FetchTextureResourcesTask::FetchTextureResourcesOnGpuThread() {
+  DCHECK(gpu_thread_checker_.CalledOnValidThread());
+
+  gpu::SyncPointManager* sync_point_manager =
+      content::GpuChildThread::GetChannelManager()->sync_point_manager();
+  if (sync_point_manager->IsSyncPointRetired(sync_point_)) {
+    OnSyncPointRetired();
+    return;
+  }
+
+  sync_point_manager->AddSyncPointCallback(
+      sync_point_,
+      base::Bind(&FetchTextureResourcesTask::OnSyncPointRetired,
+                 this));
+>>>>>>> MERGE-SOURCE
 }
 
 void CompositorThread::Init() {

=== modified file 'shared/browser/oxide_browser_process_main.cc'
--- shared/browser/oxide_browser_process_main.cc	2015-03-25 21:56:29 +0000
+++ shared/browser/oxide_browser_process_main.cc	2015-04-10 12:47:19 +0000
@@ -322,7 +322,15 @@
 
   FormFactor form_factor = GetFormFactorHint();
 
+<<<<<<< TREE
   if (form_factor != FORM_FACTOR_DESKTOP) {
+=======
+  if (form_factor == FORM_FACTOR_DESKTOP) {
+    // Pinch-viewport is not supported on desktop yet
+    // see https://launchpad.net/bugs/1426567 and https://launchpad.net/bugs/1408686
+    command_line->AppendSwitch(cc::switches::kDisablePinchVirtualViewport);
+  } else {
+>>>>>>> MERGE-SOURCE
     command_line->AppendSwitch(switches::kEnableViewport);
     command_line->AppendSwitch(switches::kEnableViewportMeta);
     command_line->AppendSwitch(switches::kMainFrameResizesAreOrientationChanges);

=== modified file 'shared/browser/oxide_content_browser_client.cc'
--- shared/browser/oxide_content_browser_client.cc	2015-04-07 14:20:35 +0000
+++ shared/browser/oxide_content_browser_client.cc	2015-04-10 12:47:19 +0000
@@ -64,6 +64,21 @@
 
 namespace oxide {
 
+<<<<<<< TREE
+=======
+namespace {
+
+void RespondToGeolocationPermissionRequest(
+    const base::Callback<void(bool)>& callback,
+    bool result) {
+  content::GeolocationProvider::GetInstance()
+      ->UserDidOptIntoLocationServices();
+  callback.Run(result);
+}
+
+}
+
+>>>>>>> MERGE-SOURCE
 ContentBrowserClient::ContentBrowserClient() {}
 
 ContentBrowserClient::~ContentBrowserClient() {}

=== modified file 'shared/browser/oxide_gesture_provider.cc'
=== modified file 'shared/browser/oxide_web_frame.cc'
--- shared/browser/oxide_web_frame.cc	2015-04-07 15:22:49 +0000
+++ shared/browser/oxide_web_frame.cc	2015-04-10 12:47:19 +0000
@@ -231,10 +231,17 @@
       std::find(current_script_message_requests_.begin(),
                 current_script_message_requests_.end(),
                 req);
+<<<<<<< TREE
   if (it == current_script_message_requests_.end()) {
     // can happen for non "persisted" requests e.g. SendMessageNoReply
     return;
   }
+=======
+  if (it == current_script_message_requests_.end()) {
+    // can happen for non lasting requests e.g. SendMessageNoReply
+    return;
+  }
+>>>>>>> MERGE-SOURCE
 
   if (!destroyed_) {
     current_script_message_requests_.erase(it);

=== modified file 'shared/browser/oxide_web_view.cc'
=== modified file 'shared/common/oxide_event_utils.cc'
=== modified file 'shared/renderer/oxide_content_renderer_client.cc'
--- shared/renderer/oxide_content_renderer_client.cc	2015-04-02 08:05:08 +0000
+++ shared/renderer/oxide_content_renderer_client.cc	2015-04-10 12:47:19 +0000
@@ -158,6 +158,7 @@
 }
 #endif
 
+<<<<<<< TREE
 void ContentRendererClient::OverrideCompositorSettings(
     cc::LayerTreeSettings* settings) {
   // XXX: If we support overlay scrollbars on desktop, then we'll want to
@@ -184,4 +185,27 @@
   }
 }
 
+=======
+void ContentRendererClient::OverrideCompositorSettings(
+    cc::LayerTreeSettings* settings) {
+  // XXX: If we support overlay scrollbars on desktop, then we'll want to
+  //  use THINNING here, change the other settings and modify Blink to
+  //  be able to have 2 different overlay scrollbar styles (a small
+  //  non-hit-tested style for mobile and a much larger hit-tested style
+  //  for desktop)
+  if (ui::IsOverlayScrollbarEnabled()) {
+    // XXX: This will need updating if we support overlay scrollbars on
+    //  desktop. See https://launchpad.net/bugs/1426567
+    settings->scrollbar_animator = cc::LayerTreeSettings::LinearFade;
+    settings->scrollbar_fade_delay_ms = 300;
+    settings->scrollbar_fade_resize_delay_ms = 2000;
+    settings->scrollbar_fade_duration_ms = 300;
+  }
+
+  // XXX: This will need changing if we support pinch-viewport on desktop
+  //  with normal scrollbars. See https://launchpad.net/bugs/1426567
+  settings->scrollbar_show_scale_threshold = 1.f;
+}
+
+>>>>>>> MERGE-SOURCE
 } // namespace oxide

=== modified file 'shared/renderer/oxide_content_renderer_client.h'
=== modified file 'shared/shared.gyp'