Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(113)

Side by Side Diff: Source/WebKit/chromium/src/WebViewImpl.cpp

Issue 15861022: Build WTF as dll in component build (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix AutoDrainedPool ctor and ThreadSpecificThreadExit exports Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 #if ENABLE(NAVIGATOR_CONTENT_UTILS) 426 #if ENABLE(NAVIGATOR_CONTENT_UTILS)
427 , m_navigatorContentUtilsClient(NavigatorContentUtilsClientImpl::create(this )) 427 , m_navigatorContentUtilsClient(NavigatorContentUtilsClientImpl::create(this ))
428 #endif 428 #endif
429 , m_flingModifier(0) 429 , m_flingModifier(0)
430 , m_flingSourceDevice(false) 430 , m_flingSourceDevice(false)
431 , m_showFPSCounter(false) 431 , m_showFPSCounter(false)
432 , m_showPaintRects(false) 432 , m_showPaintRects(false)
433 , m_showDebugBorders(false) 433 , m_showDebugBorders(false)
434 , m_continuousPaintingEnabled(false) 434 , m_continuousPaintingEnabled(false)
435 { 435 {
436 // WebKit/win/WebView.cpp does the same thing, except they call the
437 // KJS specific wrapper around this method. We need to have threading
438 // initialized because CollatorICU requires it.
439 WTF::initializeThreading();
440 WTF::initializeMainThread();
441
442 Page::PageClients pageClients; 436 Page::PageClients pageClients;
443 pageClients.chromeClient = &m_chromeClientImpl; 437 pageClients.chromeClient = &m_chromeClientImpl;
444 pageClients.contextMenuClient = &m_contextMenuClientImpl; 438 pageClients.contextMenuClient = &m_contextMenuClientImpl;
445 pageClients.editorClient = &m_editorClientImpl; 439 pageClients.editorClient = &m_editorClientImpl;
446 pageClients.dragClient = &m_dragClientImpl; 440 pageClients.dragClient = &m_dragClientImpl;
447 pageClients.inspectorClient = &m_inspectorClientImpl; 441 pageClients.inspectorClient = &m_inspectorClientImpl;
448 pageClients.backForwardClient = &m_backForwardClientImpl; 442 pageClients.backForwardClient = &m_backForwardClientImpl;
449 443
450 m_page = adoptPtr(new Page(pageClients)); 444 m_page = adoptPtr(new Page(pageClients));
451 provideUserMediaTo(m_page.get(), &m_userMediaClientImpl); 445 provideUserMediaTo(m_page.get(), &m_userMediaClientImpl);
(...skipping 3687 matching lines...) Expand 10 before | Expand all | Expand 10 after
4139 } 4133 }
4140 4134
4141 bool WebViewImpl::shouldDisableDesktopWorkarounds() 4135 bool WebViewImpl::shouldDisableDesktopWorkarounds()
4142 { 4136 {
4143 ViewportArguments arguments = mainFrameImpl()->frame()->document()->viewport Arguments(); 4137 ViewportArguments arguments = mainFrameImpl()->frame()->document()->viewport Arguments();
4144 return arguments.width == ViewportArguments::ValueDeviceWidth || !arguments. userZoom 4138 return arguments.width == ViewportArguments::ValueDeviceWidth || !arguments. userZoom
4145 || (arguments.minZoom == arguments.maxZoom && arguments.minZoom != Viewp ortArguments::ValueAuto); 4139 || (arguments.minZoom == arguments.maxZoom && arguments.minZoom != Viewp ortArguments::ValueAuto);
4146 } 4140 }
4147 4141
4148 } // namespace WebKit 4142 } // namespace WebKit
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/src/WebKit.cpp ('k') | Source/WebKit/chromium/tests/DeferredImageDecoderTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698